From 451a29ada517fad99a5de823efca8758416ccd46 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 26 Nov 2014 00:03:40 +0100
Subject: ACCESS: Fix character in first screen when the intro is played

---
 engines/access/amazon/amazon_game.cpp | 9 +++++++--
 engines/access/amazon/amazon_game.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index 33e5888cf4..6288ddb64b 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -107,6 +107,8 @@ void AmazonEngine::playGame() {
 	_screen->forceFadeOut();
 	_events->showCursor();
 
+	initVariables();
+
 	// If there's a pending savegame to load, load it
 	if (_loadSaveSlot != -1)
 		loadGameState(_loadSaveSlot);
@@ -430,8 +432,6 @@ void AmazonEngine::doTent() {
 }
 
 void AmazonEngine::setupGame() {
-	_chapter = 1;
-
 	// Setup timers
 	const int TIMER_DEFAULTS[] = { 3, 10, 8, 1, 1, 1, 1, 2 };
 	for (int i = 0; i < 32; ++i) {
@@ -456,6 +456,11 @@ void AmazonEngine::setupGame() {
 	_fonts._font1.load(FONT6x6_INDEX, FONT6x6_DATA);
 	_fonts._font2.load(FONT2_INDEX, FONT2_DATA);
 
+	initVariables();
+}
+
+void AmazonEngine::initVariables() {
+	_chapter = 1;
 	// Set player room and position
 	_player->_roomNumber = 4;
 	_player->_playerX = _player->_rawPlayer.x = TRAVEL_POS[_player->_roomNumber][0];
diff --git a/engines/access/amazon/amazon_game.h b/engines/access/amazon/amazon_game.h
index 6208796b8a..e6c817d242 100644
--- a/engines/access/amazon/amazon_game.h
+++ b/engines/access/amazon/amazon_game.h
@@ -83,6 +83,7 @@ private:
 	 */
 	void setupGame();
 
+	void initVariables();
 	void calcIQ();
 	void helpTitle();
 	void drawHelpText(const Common::String &msg);
-- 
cgit v1.2.3