From a0294b633896dda85d3dee610c4ba2f938f3d731 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Tue, 18 Nov 2014 00:36:39 +0100
Subject: ACCESS: Move setupGame before doIntroduction to fix a crash

---
 engines/access/amazon/amazon_game.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/access')

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();
-- 
cgit v1.2.3