[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.84,1.85

[Max Horn]

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

Modified Files:
	object.cpp 
Log Message:
fixed regression in MonkeyVGA <sigh>. Aquadran, is the 16 right even for GF_OLD_BUNDLE ? Or should it just always be 1?

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- object.cpp	28 Apr 2003 18:28:43 -0000	1.84
+++ object.cpp	1 May 2003 16:05:47 -0000	1.85
@@ -637,9 +637,9 @@
 		od->x_pos = *(ptr + 9) << 3;
 		od->y_pos = ((*(ptr + 10)) & 0x7F) << 3;
 
-		od->parentstate = (*(ptr + 10) & 0x80) ? 16 : 0;
-		if (_features & GF_OLD256 && od->parentstate)
-			od->parentstate = 1;
+		od->parentstate = (*(ptr + 10) & 0x80) ? 1 : 0;
+		if (_features & GF_OLD_BUNDLE)
+			od->parentstate <<= 4;
 
 		od->width = *(ptr + 11) << 3;