[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.71,1.72 gfx.cpp,2.50,2.51

[Max Horn]

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

Modified Files:
	object.cpp gfx.cpp 
Log Message:
fixed OLD_BUNDLE object image offset

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- object.cpp	12 Apr 2003 12:58:20 -0000	1.71
+++ object.cpp	12 Apr 2003 18:43:23 -0000	1.72
@@ -354,7 +354,9 @@
 		ptr = ptr + od->OBIMoffset;
 	}
 
-	if (_features & GF_SMALL_HEADER)
+	if (_features & GF_OLD_BUNDLE)
+		ptr += 0;
+	else if (_features & GF_SMALL_HEADER)
 		ptr += 8;
 	else if (_features & GF_AFTER_V8) {
 		ptr = findResource(MKID('IMAG'), ptr);

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.50
retrieving revision 2.51
diff -u -d -r2.50 -r2.51
--- gfx.cpp	12 Apr 2003 11:44:15 -0000	2.50
+++ gfx.cpp	12 Apr 2003 18:43:23 -0000	2.51
@@ -952,7 +952,7 @@
 			} else {
 				useOrDecompress = decompressBitmap(bgbak_ptr, smap_ptr + READ_LE_UINT32(smap_ptr + stripnr * 4 + 4), h);
 			}
-		}	else {
+		} else {
 			useOrDecompress = decompressBitmap(bgbak_ptr, smap_ptr + READ_LE_UINT32(smap_ptr + stripnr * 4 + 8), h);
 		}