[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.91,2.92

Max Horn fingolfin at users.sourceforge.net
Sat Apr 12 18:52:04 CEST 2003


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

Modified Files:
	scummvm.cpp 
Log Message:
fixed my box size hack

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.91
retrieving revision 2.92
diff -u -d -r2.91 -r2.92
--- scummvm.cpp	12 Apr 2003 20:07:08 -0000	2.91
+++ scummvm.cpp	13 Apr 2003 01:51:24 -0000	2.92
@@ -881,14 +881,14 @@
 	if (!roomptr || !roomResPtr)
 		error("Room %d: data not found (" __FILE__  ":%d)", _roomResource, __LINE__);
 
+	//
+	// Determine the room dimensions (width/height)
+	//
 	if (_features & GF_OLD_BUNDLE)
 		rmhd = (RoomHeader *)(roomptr + 4);
 	else
 		rmhd = (RoomHeader *)findResourceData(MKID('RMHD'), roomptr);
 	
-	//
-	// Determine the room dimensions (width/height)
-	//
 	if (_features & GF_AFTER_V8) {
 		_scrWidth = READ_LE_UINT32(&(rmhd->v8.width));
 		_scrHeight = READ_LE_UINT32(&(rmhd->v8.height));
@@ -968,7 +968,7 @@
 			ptr += size;
 			if (_features & GF_OLD_BUNDLE)
 				// FIXME. This is an evil HACK!!!
-				size = (READ_LE_UINT16(roomptr + 0x15) - READ_LE_UINT16(roomptr + 0x0A)) - size;
+				size = (READ_LE_UINT16(roomptr + 0x0A) - READ_LE_UINT16(roomptr + 0x15)) - size;
 			else
 				size = getResourceDataSize(ptr - size - 6) - size;
 





More information about the Scummvm-git-logs mailing list