[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.11,1.12 object.cpp,1.3,1.4

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv25061/scumm

Modified Files:
	actor.cpp object.cpp 
Log Message:
Patch 613597: Sam and Max object ordering fixme thingzie.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- actor.cpp	22 Sep 2002 03:53:52 -0000	1.11
+++ actor.cpp	24 Sep 2002 15:23:57 -0000	1.12
@@ -859,12 +859,6 @@
 	if (!needRedraw)
 		return;
 
-	// FIXME: ugly fix for samnmax inventory (otherwise actors get drawn over the
-	// inventory). We make an exception for room 66 (the Car Bomb game), for otherwise
-	// that will be drawn incorrectly. Oh well....
-	if (_vm->_gameId == GID_SAMNMAX && _vm->getState(995) && _vm->_currentRoom != 66)
-		return;
-
 	needRedraw = false;
 
 	setupActorScale();

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- object.cpp	19 Sep 2002 11:06:10 -0000	1.3
+++ object.cpp	24 Sep 2002 15:23:57 -0000	1.4
@@ -375,7 +375,9 @@
 
 	if (numstrip != 0) {
 		byte flags = Gdi::dbAllowMaskOr;
-		if (_features & GF_AFTER_V7 && getClass(od->obj_nr, 22))
+		// Sam & Max needs this to fix object-layering problems with
+		// the inventory and conversation icons.
+		if ((_features & GF_AFTER_V7 || _gameId == GID_SAMNMAX) && getClass(od->obj_nr, 22))
 			flags |= Gdi::dbDrawMaskOnBoth;
 		gdi.drawBitmap(ptr, _curVirtScreen, x, ypos, height, x - xpos, numstrip, flags);
 	}