[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.7,1.8

[Max Horn]

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

Modified Files:
	actor.cpp 
Log Message:
patch #611449: Workaround for bug #604398

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- actor.cpp	17 Sep 2002 12:52:53 -0000	1.7
+++ actor.cpp	19 Sep 2002 10:42:10 -0000	1.8
@@ -859,8 +859,10 @@
 	if (!needRedraw)
 		return;
 
-	// FIXME: ugly fix for samnmax inventory
-	if (_vm->_gameId == GID_SAMNMAX && _vm->getState(995))
+	// 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;