[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.143,1.144 saveload.h,1.33,1.34

Travis Howell kirben at users.sourceforge.net
Sat Feb 21 00:33:01 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28314/scumm

Modified Files:
	saveload.cpp saveload.h 
Log Message:

Correct VAR_CHARINC in old saves.


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- saveload.cpp	20 Feb 2004 01:31:29 -0000	1.143
+++ saveload.cpp	21 Feb 2004 08:21:11 -0000	1.144
@@ -179,6 +179,10 @@
 	if (_screenTop < 0)
 		_screenTop = 0;
 	
+	// For a long time, we used incorrect location, causing it to default to zero.
+	if (hdr.ver < VER(30) && _version == 8)
+		_scummVars[VAR_CHARINC] = (_features & GF_DEMO) ? 3 : 1;
+
 	// For a long time, we used incorrect locations for some camera related
 	// scumm vars. We now know the proper locations. To be able to properly use
 	// old save games, we update the old (bad) variables to the new (correct)

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- saveload.h	17 Feb 2004 00:40:51 -0000	1.33
+++ saveload.h	21 Feb 2004 08:21:11 -0000	1.34
@@ -32,7 +32,7 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 29
+#define CURRENT_VER 30
 
 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
 // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC





More information about the Scummvm-git-logs mailing list