From e80d5a866b3a327eaa4e36a9baac3f8d09f82620 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 19 Sep 2002 10:42:10 +0000
Subject: patch #611449: Workaround for bug #604398

svn-id: r4969
---
 scumm/actor.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scumm/actor.cpp')

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;
-- 
cgit v1.2.3