aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray2002-11-11 04:42:43 +0000
committerJonathan Gray2002-11-11 04:42:43 +0000
commit54a5c1fb3a0af449b28d18a63a00347bdd1845d0 (patch)
treece860cc78fb6da7e4ee22015b6bcff79bbd0561e
parent36309567c30b0011cf27aff2e8faa8d217447cd0 (diff)
downloadscummvm-rg350-54a5c1fb3a0af449b28d18a63a00347bdd1845d0.tar.gz
scummvm-rg350-54a5c1fb3a0af449b28d18a63a00347bdd1845d0.tar.bz2
scummvm-rg350-54a5c1fb3a0af449b28d18a63a00347bdd1845d0.zip
confine dodgy hack in indy3 that should probably be removed
svn-id: r5515
-rw-r--r--scumm/object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index c0fa146b71..c0984c3e7a 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -39,7 +39,7 @@ bool Scumm::getClass(int obj, int cls)
if (cls == 32) // CLASS_TOUCHABLE
cls = 24;
- if (_gameId == GID_INDY3_256 && cls == 22) // Masking fix for Indy3
+ if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76) // Masking fix for Indy3
cls = 21;
}
return (_classData[obj] & (1 << (cls - 1))) != 0;
@@ -59,7 +59,7 @@ void Scumm::putClass(int obj, int cls, bool set)
if (cls == 32) // CLASS_TOUCHABLE
cls = 24;
- if (_gameId == GID_INDY3_256 && cls == 22) // Masking fix for Indy3
+ if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76) // Masking fix for Indy3
cls = 21;
}