From 3739d82f62e89b6a0690f52934a5489529d81dd5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 6 Jun 2009 01:00:44 +0000
Subject: Bugfix to show the title screen at the correct speed when restarting
 the game

svn-id: r41208
---
 engines/cruise/cruise.h        | 1 +
 engines/cruise/cruise_main.cpp | 6 ++++--
 engines/cruise/cruise_main.h   | 1 -
 engines/cruise/menu.cpp        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h
index 1599c992ac..2fc69acea0 100644
--- a/engines/cruise/cruise.h
+++ b/engines/cruise/cruise.h
@@ -105,6 +105,7 @@ public:
 	virtual bool canSaveGameStateCurrently();
 
 	const CRUISEGameDescription *_gameDescription;
+	void initAllData(void);
 
 	Common::RandomSource _rnd;
 };
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index b6149d80ea..8ceef41f74 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -376,7 +376,7 @@ uint8 *mainProc14(uint16 overlay, uint16 idx) {
 	return NULL;
 }
 
-int initAllData(void) {
+void CruiseEngine::initAllData(void) {
 	int i;
 
 	setupFuncArray();
@@ -514,7 +514,9 @@ int initAllData(void) {
 
 	strcpy(lastOverlay, "AUTO00");
 
-	return (bootOverlayNumber);
+	_gameSpeed = GAME_FRAME_DELAY_1;
+
+	return;
 }
 
 int removeFinishedScripts(scriptInstanceStruct *ptrHandle) {
diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h
index 1b300bd587..86e8dc1591 100644
--- a/engines/cruise/cruise_main.h
+++ b/engines/cruise/cruise_main.h
@@ -117,7 +117,6 @@ void closeAllMenu(void);
 int removeFinishedScripts(scriptInstanceStruct *ptrHandle);
 void initBigVar3(void);
 void resetActorPtr(actorStruct *ptr);
-int initAllData(void);
 
 } // End of namespace Cruise
 
diff --git a/engines/cruise/menu.cpp b/engines/cruise/menu.cpp
index 9b59494f96..136bd281dc 100644
--- a/engines/cruise/menu.cpp
+++ b/engines/cruise/menu.cpp
@@ -264,7 +264,7 @@ int playerMenu(int menuX, int menuY) {
 			Op_FadeOut();
 			memset(globalScreen, 0, 320 * 200);
 			initVars();
-			initAllData();
+			_vm->initAllData();
 			changeCursor(CURSOR_NORMAL);
 			userEnabled = 0;
 			break;
-- 
cgit v1.2.3