[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.98,2.99

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Apr 21 06:20:06 CEST 2003


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

Modified Files:
	scummvm.cpp 
Log Message:
arrgh (revert)

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.98
retrieving revision 2.99
diff -u -d -r2.98 -r2.99
--- scummvm.cpp	21 Apr 2003 13:10:58 -0000	2.98
+++ scummvm.cpp	21 Apr 2003 13:19:19 -0000	2.99
@@ -928,7 +928,7 @@
 	//
 	if (_features & GF_AFTER_V2)
 		_EXCD_offs = READ_LE_UINT16(roomptr + 0x18);
-	else if (_features & GF_AFTER_V3)
+	else if (_features & GF_OLD_BUNDLE)
 		_EXCD_offs = READ_LE_UINT16(roomptr + 0x19);
 	else {
 		ptr = findResourceData(MKID('EXCD'), roomResPtr);
@@ -943,7 +943,7 @@
 	//
 	if (_features & GF_AFTER_V2)
 		_ENCD_offs = READ_LE_UINT16(roomptr + 0x1C);
-	else if (_features & GF_AFTER_V3)
+	else if (_features & GF_OLD_BUNDLE)
 		_ENCD_offs = READ_LE_UINT16(roomptr + 0x1B);
 	else {
 		ptr = findResourceData(MKID('ENCD'), roomResPtr);
@@ -959,7 +959,7 @@
 	if (_features & GF_SMALL_HEADER) {
 		if (_features & GF_AFTER_V2)
 			ptr = roomptr + *(roomptr + 0x15);
-		else if (_features & GF_AFTER_V3)
+		else if (_features & GF_OLD_BUNDLE)
 			ptr = roomptr + READ_LE_UINT16(roomptr + 0x15);
 		else
 			ptr = findResourceData(MKID('BOXD'), roomptr);
@@ -976,7 +976,7 @@
 			ptr += size;
 			if (_features & GF_AFTER_V2)
 				size = (READ_LE_UINT16(roomptr + 0x0A) - *(roomptr + 0x15)) - size;
-			else if (_features & GF_AFTER_V3)
+			else if (_features & GF_OLD_BUNDLE)
 				// FIXME. This is an evil HACK!!!
 				size = (READ_LE_UINT16(roomptr + 0x0A) - READ_LE_UINT16(roomptr + 0x15)) - size;
 			else





More information about the Scummvm-git-logs mailing list