aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorStrangerke2014-11-18 00:36:39 +0100
committerPaul Gilbert2014-12-12 22:34:13 -0500
commita0294b633896dda85d3dee610c4ba2f938f3d731 (patch)
treedaa82123dc5e61f2c960510ecda082bb94164b86 /engines
parentf70012a115dc963f21ac531d57e593af0e5a1ccf (diff)
downloadscummvm-rg350-a0294b633896dda85d3dee610c4ba2f938f3d731.tar.gz
scummvm-rg350-a0294b633896dda85d3dee610c4ba2f938f3d731.tar.bz2
scummvm-rg350-a0294b633896dda85d3dee610c4ba2f938f3d731.zip
ACCESS: Move setupGame before doIntroduction to fix a crash
Diffstat (limited to 'engines')
-rw-r--r--engines/access/amazon/amazon_game.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index e9c42d0647..44071753d2 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -83,6 +83,9 @@ void AmazonEngine::playGame() {
_room = new AmazonRoom(this);
_scripts = new AmazonScripts(this);
+ // Setup the game
+ setupGame();
+
if (_loadSaveSlot == -1) {
// Do introduction
doIntroduction();
@@ -90,9 +93,6 @@ void AmazonEngine::playGame() {
return;
}
- // Setup the game
- setupGame();
-
_screen->clearScreen();
_screen->setPanel(0);
_screen->forceFadeOut();