[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.130,1.131 saveload.h,1.29,1.30

Max Horn fingolfin at users.sourceforge.net
Tue Jan 6 03:46:00 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3440

Modified Files:
	saveload.cpp saveload.h 
Log Message:
no need to save information which we can (and do) recompute

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- saveload.cpp	4 Jan 2004 14:49:14 -0000	1.130
+++ saveload.cpp	6 Jan 2004 11:45:28 -0000	1.131
@@ -458,11 +458,13 @@
 
 		MKLINE(ScummEngine, _egoPositioned, sleByte, VER(8)),
 
-		// gdi._imgBufOffs grew from 4 to 5 entries :
-		MKARRAY_OLD(ScummEngine, gdi._imgBufOffs[0], sleUint16, 4, VER(8), VER(9)),
-		MKARRAY(ScummEngine, gdi._imgBufOffs[0], sleUint16, 5, VER(10)),
+		// gdi._imgBufOffs grew from 4 to 5 entries. Then one day we relized
+		// that we don't have to store it since initBGBuffers() recomputes it.
+		MK_OBSOLETE_ARRAY(ScummEngine, gdi._imgBufOffs[0], sleUint16, 4, VER(8), VER(9)),
+		MK_OBSOLETE_ARRAY(ScummEngine, gdi._imgBufOffs[0], sleUint16, 5, VER(10), VER(26)),
 
-		MKLINE(ScummEngine, gdi._numZBuffer, sleByte, VER(8)),
+		// See _imgBufOffs: _numZBuffer is recomputed by initBGBuffers().
+		MK_OBSOLETE(ScummEngine, gdi._numZBuffer, sleByte, VER(8), VER(26)),
 
 		MKLINE(ScummEngine, _screenEffectFlag, sleByte, VER(8)),
 

Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- saveload.h	27 Dec 2003 00:10:20 -0000	1.29
+++ saveload.h	6 Jan 2004 11:45:28 -0000	1.30
@@ -32,7 +32,7 @@
 // Can be useful for other ports too :)
 
 #define VER(x) x
-#define CURRENT_VER 26
+#define CURRENT_VER 27
 
 // 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