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

[dreammaster at users.sourceforge.net]

Revision: 41423
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41423&view=rev
Author:   dreammaster
Date:     2009-06-10 12:15:50 +0000 (Wed, 10 Jun 2009)

Log Message:
-----------
Added variable to savegame format so that savegames can be correctly loaded from the ScummVM launcher

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

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2009-06-10 10:28:43 UTC (rev 41422)
+++ scummvm/trunk/engines/cruise/function.cpp	2009-06-10 12:15:50 UTC (rev 41423)
@@ -774,8 +774,6 @@
 	return 0;
 }
 
-int16 protectionCode = 0;
-
 int16 Op_ProtectionFlag(void) {
 	int16 temp = protectionCode;
 	int16 newVar;

Modified: scummvm/trunk/engines/cruise/saveload.cpp
===================================================================
--- scummvm/trunk/engines/cruise/saveload.cpp	2009-06-10 10:28:43 UTC (rev 41422)
+++ scummvm/trunk/engines/cruise/saveload.cpp	2009-06-10 12:15:50 UTC (rev 41423)
@@ -25,6 +25,7 @@
 
 #include "cruise/cruise_main.h"
 #include "cruise/cruise.h"
+#include "cruise/vars.h"
 
 #include "common/serializer.h"
 #include "common/savefile.h"
@@ -143,6 +144,7 @@
 	s.syncAsSint16LE(flagCt);
 	s.syncAsSint16LE(var41);
 	s.syncAsSint16LE(playerMenuEnabled);
+	s.syncAsSint16LE(protectionCode);
 }
 
 static void syncBackgroundTable(Common::Serializer &s) {

Modified: scummvm/trunk/engines/cruise/vars.cpp
===================================================================
--- scummvm/trunk/engines/cruise/vars.cpp	2009-06-10 10:28:43 UTC (rev 41422)
+++ scummvm/trunk/engines/cruise/vars.cpp	2009-06-10 12:15:50 UTC (rev 41423)
@@ -79,6 +79,8 @@
 
 int16 displayOn = 1;
 
+int16 protectionCode = 0;
+
 int16 globalVars[2000];
 
 dataFileEntry filesDatabase[NUM_FILE_ENTRIES];

Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h	2009-06-10 10:28:43 UTC (rev 41422)
+++ scummvm/trunk/engines/cruise/vars.h	2009-06-10 12:15:50 UTC (rev 41423)
@@ -183,6 +183,8 @@
 
 extern int16 displayOn;
 
+extern int16 protectionCode;
+
 #define NUM_FILE_ENTRIES 257
 
 extern int16 globalVars[2000];


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