[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.85,1.86 scummvm.cpp,2.213,2.214

Max Horn fingolfin at users.sourceforge.net
Thu Jun 5 03:34:08 CEST 2003


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

Modified Files:
	saveload.cpp scummvm.cpp 
Log Message:
restricted check to V2, stupid mistake

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- saveload.cpp	5 Jun 2003 10:28:48 -0000	1.85
+++ saveload.cpp	5 Jun 2003 10:33:12 -0000	1.86
@@ -182,7 +182,7 @@
 
 	initBGBuffers(_roomHeight);
 
-	if (_features & GF_OLD_BUNDLE) {
+	if (_features & GF_AFTER_V2) {
 		// Regenerate strip table when loading
 		_roomStrips = gdi.generateStripTable(getResourceAddress(rtRoom, _roomResource) + _IM00_offs,
 		                                     _roomWidth, _roomHeight, _roomStrips);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.213
retrieving revision 2.214
diff -u -d -r2.213 -r2.214
--- scummvm.cpp	5 Jun 2003 07:25:36 -0000	2.213
+++ scummvm.cpp	5 Jun 2003 10:33:13 -0000	2.214
@@ -1413,7 +1413,8 @@
 	//
 	if (_features & GF_OLD_BUNDLE) {
 		_IM00_offs = READ_LE_UINT16(roomptr + 0x0A);
-		_roomStrips = gdi.generateStripTable(roomptr + _IM00_offs, _roomWidth, _roomHeight, _roomStrips);
+		if (_features & GF_AFTER_V2)
+			_roomStrips = gdi.generateStripTable(roomptr + _IM00_offs, _roomWidth, _roomHeight, _roomStrips);
 	} else if (_features & GF_SMALL_HEADER)
 		_IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr;
 	else if (_features & GF_AFTER_V8) {





More information about the Scummvm-git-logs mailing list