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

[dreammaster at users.sourceforge.net]

Revision: 39981
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39981&view=rev
Author:   dreammaster
Date:     2009-04-18 12:03:21 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
Implemented the 'Start Again' menu option to properly restart the game

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

Modified: scummvm/trunk/engines/cruise/cruise_main.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.h	2009-04-18 11:20:05 UTC (rev 39980)
+++ scummvm/trunk/engines/cruise/cruise_main.h	2009-04-18 12:03:21 UTC (rev 39981)
@@ -124,6 +124,7 @@
 int removeFinishedScripts(scriptInstanceStruct *ptrHandle);
 void initBigVar3(void);
 void resetActorPtr(actorStruct *ptr);
+int initAllData(void);
 
 } // End of namespace Cruise
 

Modified: scummvm/trunk/engines/cruise/function.h
===================================================================
--- scummvm/trunk/engines/cruise/function.h	2009-04-18 11:20:05 UTC (rev 39980)
+++ scummvm/trunk/engines/cruise/function.h	2009-04-18 12:03:21 UTC (rev 39981)
@@ -35,6 +35,7 @@
 int16 subOp23(int param1, int param2);
 void freeObjectList(cellStruct *pListHead);
 int removeAnimation(actorStruct * pHead, int overlay, int objIdx, int objType);
+int16 Op_FadeOut(void);
 
 } // End of namespace Cruise
 

Modified: scummvm/trunk/engines/cruise/menu.cpp
===================================================================
--- scummvm/trunk/engines/cruise/menu.cpp	2009-04-18 11:20:05 UTC (rev 39980)
+++ scummvm/trunk/engines/cruise/menu.cpp	2009-04-18 12:03:21 UTC (rev 39981)
@@ -261,6 +261,12 @@
 			loadSavegameData(0);
 			break;
 		case 6: // restart
+			Op_FadeOut();
+			memset(globalScreen, 0, 320 * 200);
+			initVars();
+			initAllData();
+			changeCursor(CURSOR_NORMAL);
+			userEnabled = 0;
 			break;
 		case 7: // exit
 			return 1;

Modified: scummvm/trunk/engines/cruise/saveload.h
===================================================================
--- scummvm/trunk/engines/cruise/saveload.h	2009-04-18 11:20:05 UTC (rev 39980)
+++ scummvm/trunk/engines/cruise/saveload.h	2009-04-18 12:03:21 UTC (rev 39981)
@@ -42,6 +42,7 @@
 Common::Error saveSavegameData(int saveGameIdx, const Common::String &saveName);
 Common::Error loadSavegameData(int saveGameIdx);
 bool readSavegameHeader(Common::InSaveFile *in, CruiseSavegameHeader &header);
+void initVars(void);
 
 } // End of namespace Cruise
 


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