aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorGregory Montoir2005-10-22 08:19:28 +0000
committerGregory Montoir2005-10-22 08:19:28 +0000
commit883fe108d202cba21210d12f5efeed376b45fd60 (patch)
tree07fd3b29fd33a31b0bf52d4e378b416576ddaa7b /scumm
parent3374e399b59cc77ffe14eba180fd27319ea3dba9 (diff)
downloadscummvm-rg350-883fe108d202cba21210d12f5efeed376b45fd60.tar.gz
scummvm-rg350-883fe108d202cba21210d12f5efeed376b45fd60.tar.bz2
scummvm-rg350-883fe108d202cba21210d12f5efeed376b45fd60.zip
Gdi::dbDrawMaskOnAll doesn't need to be set in TheDig and FT sets it when object has class 31.
svn-id: r19233
Diffstat (limited to 'scumm')
-rw-r--r--scumm/object.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 04cbf8e694..1ed1b88655 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -489,7 +489,8 @@ void ScummEngine::drawObject(int obj, int arg) {
// Sam & Max needs this to fix object-layering problems with
// the inventory and conversation icons.
- if ((_version == 7 || _gameId == GID_SAMNMAX) && getClass(od.obj_nr, kObjectClassIgnoreBoxes))
+ if ((_gameId == GID_SAMNMAX && getClass(od.obj_nr, kObjectClassIgnoreBoxes)) ||
+ (_gameId == GID_FT && getClass(od.obj_nr, kObjectClassPlayer)))
flags |= Gdi::dbDrawMaskOnAll;
if (_heversion >= 70 && findResource(MKID('SMAP'), ptr) == NULL)