[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.159,1.160 saveload.h,1.36,1.37

Travis Howell kirben at users.sourceforge.net
Fri Jul 16 07:42:02 CEST 2004


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

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

Set new VARS for older save games.


Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- saveload.cpp	11 Jul 2004 11:59:18 -0000	1.159
+++ saveload.cpp	16 Jul 2004 14:41:04 -0000	1.160
@@ -183,6 +183,13 @@
 	if (_screenTop < 0)
 		_screenTop = 0;
 	
+	if (hdr.ver < VER(33) && _version >= 7) {
+		// For a long time, we didn't set these vars to default values.
+		VAR(VAR_DEFAULT_TALK_DELAY) = 60;
+		if (_version == 7)
+			VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
+	}
+
 	if (hdr.ver < VER(32) && _heversion == 70) {
 		roomptr = getResourceAddress(rtRoom, _roomResource);
 		const byte *ptr = findResourceData(MKID('REMP'), roomptr);

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- saveload.h	11 Jul 2004 11:59:18 -0000	1.36
+++ saveload.h	16 Jul 2004 14:41:05 -0000	1.37
@@ -32,7 +32,7 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 32
+#define CURRENT_VER 33
 
 // 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