aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2002-09-19 10:42:10 +0000
committerMax Horn2002-09-19 10:42:10 +0000
commite80d5a866b3a327eaa4e36a9baac3f8d09f82620 (patch)
tree0108d9264998344ced5ff8841e60ce4108dd00f6 /scumm
parentab1cc774c825c817bcd9c4a11aa07b1fd4286cf5 (diff)
downloadscummvm-rg350-e80d5a866b3a327eaa4e36a9baac3f8d09f82620.tar.gz
scummvm-rg350-e80d5a866b3a327eaa4e36a9baac3f8d09f82620.tar.bz2
scummvm-rg350-e80d5a866b3a327eaa4e36a9baac3f8d09f82620.zip
patch #611449: Workaround for bug #604398
svn-id: r4969
Diffstat (limited to 'scumm')
-rw-r--r--scumm/actor.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index bd94f91d83..6f45edf088 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -859,8 +859,10 @@ void Actor::drawActorCostume()
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;