aboutsummaryrefslogtreecommitdiff
path: root/scumm/object.cpp
diff options
context:
space:
mode:
authorJames Brown2002-11-10 18:11:39 +0000
committerJames Brown2002-11-10 18:11:39 +0000
commit4cf3def44bb86e8decb07f19b53ec6fe7c12087d (patch)
tree7c4f40c92daf63c9ebc0faa121ee35fba758804b /scumm/object.cpp
parent2a58faff8f15b19ea17e545eb97ddc346bf157f3 (diff)
downloadscummvm-rg350-4cf3def44bb86e8decb07f19b53ec6fe7c12087d.tar.gz
scummvm-rg350-4cf3def44bb86e8decb07f19b53ec6fe7c12087d.tar.bz2
scummvm-rg350-4cf3def44bb86e8decb07f19b53ec6fe7c12087d.zip
Game-specific a likely incorrect fix for Indy3 (Class 22 is the "Don't mask" flag, so why translate it to something else?)
*hurts khalek badly and mumbles about regression testing during a CVS freeze..* svn-id: r5508
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r--scumm/object.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index d7420960e3..c0fa146b71 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -38,7 +38,8 @@ bool Scumm::getClass(int obj, int cls)
if (cls == 32) // CLASS_TOUCHABLE
cls = 24;
- if (cls == 22)
+
+ if (_gameId == GID_INDY3_256 && cls == 22) // Masking fix for Indy3
cls = 21;
}
return (_classData[obj] & (1 << (cls - 1))) != 0;
@@ -57,7 +58,8 @@ void Scumm::putClass(int obj, int cls, bool set)
if (cls == 32) // CLASS_TOUCHABLE
cls = 24;
- if (cls == 22)
+
+ if (_gameId == GID_INDY3_256 && cls == 22) // Masking fix for Indy3
cls = 21;
}