[Scummvm-cvs-logs] SF.net SVN: scummvm:[41208] scummvm/trunk/engines/cruise

[dreammaster at users.sourceforge.net]

Revision: 41208
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41208&view=rev
Author:   dreammaster
Date:     2009-06-06 01:00:44 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
Bugfix to show the title screen at the correct speed when restarting the game

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise.h
    scummvm/trunk/engines/cruise/cruise_main.cpp
    scummvm/trunk/engines/cruise/cruise_main.h
    scummvm/trunk/engines/cruise/menu.cpp

Modified: scummvm/trunk/engines/cruise/cruise.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise.h	2009-06-06 00:53:08 UTC (rev 41207)
+++ scummvm/trunk/engines/cruise/cruise.h	2009-06-06 01:00:44 UTC (rev 41208)
@@ -105,6 +105,7 @@
 	virtual bool canSaveGameStateCurrently();
 
 	const CRUISEGameDescription *_gameDescription;
+	void initAllData(void);
 
 	Common::RandomSource _rnd;
 };

Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp	2009-06-06 00:53:08 UTC (rev 41207)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp	2009-06-06 01:00:44 UTC (rev 41208)
@@ -376,7 +376,7 @@
 	return NULL;
 }
 
-int initAllData(void) {
+void CruiseEngine::initAllData(void) {
 	int i;
 
 	setupFuncArray();
@@ -514,7 +514,9 @@
 
 	strcpy(lastOverlay, "AUTO00");
 
-	return (bootOverlayNumber);
+	_gameSpeed = GAME_FRAME_DELAY_1;
+
+	return;
 }
 
 int removeFinishedScripts(scriptInstanceStruct *ptrHandle) {

Modified: scummvm/trunk/engines/cruise/cruise_main.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.h	2009-06-06 00:53:08 UTC (rev 41207)
+++ scummvm/trunk/engines/cruise/cruise_main.h	2009-06-06 01:00:44 UTC (rev 41208)
@@ -117,7 +117,6 @@
 int removeFinishedScripts(scriptInstanceStruct *ptrHandle);
 void initBigVar3(void);
 void resetActorPtr(actorStruct *ptr);
-int initAllData(void);
 
 } // End of namespace Cruise
 

Modified: scummvm/trunk/engines/cruise/menu.cpp
===================================================================
--- scummvm/trunk/engines/cruise/menu.cpp	2009-06-06 00:53:08 UTC (rev 41207)
+++ scummvm/trunk/engines/cruise/menu.cpp	2009-06-06 01:00:44 UTC (rev 41208)
@@ -264,7 +264,7 @@
 			Op_FadeOut();
 			memset(globalScreen, 0, 320 * 200);
 			initVars();
-			initAllData();
+			_vm->initAllData();
 			changeCursor(CURSOR_NORMAL);
 			userEnabled = 0;
 			break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.