aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2009-10-17 17:46:48 +0000
committerMartin Kiewitz2009-10-17 17:46:48 +0000
commit42dffcdcb97744c1c60a23a1494b8e9bc5f58f10 (patch)
tree3fc6a819b79f3c11d735750ca35f9e19e09d30b0
parent387db36f4d7ab78d25dc4954fcad90a447c27f85 (diff)
downloadscummvm-rg350-42dffcdcb97744c1c60a23a1494b8e9bc5f58f10.tar.gz
scummvm-rg350-42dffcdcb97744c1c60a23a1494b8e9bc5f58f10.tar.bz2
scummvm-rg350-42dffcdcb97744c1c60a23a1494b8e9bc5f58f10.zip
SCI/newgui: fix bug in kCanBeHere, fixes sq4 intro roger hanging not falling
svn-id: r45195
-rw-r--r--engines/sci/gui/gui.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 0f77597da3..3a8dec5650 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -588,7 +588,7 @@ bool SciGui::canBeHere(reg_t curObject, reg_t listReference) {
signal = GET_SEL32V(curObject, signal);
controlMask = GET_SEL32V(curObject, illegalBits);
result = (_gfx->onControl(SCI_SCREEN_MASK_CONTROL, checkRect) & controlMask) ? false : true;
- if ((result) && (signal & (SCI_ANIMATE_SIGNAL_IGNOREACTOR | SCI_ANIMATE_SIGNAL_REMOVEVIEW))) {
+ if ((result) && (signal & (SCI_ANIMATE_SIGNAL_IGNOREACTOR | SCI_ANIMATE_SIGNAL_REMOVEVIEW)) == 0) {
// FIXME: this seems to be causing problems when roger wilco falls down from time portal in the intro sequence
// There must be a bug somewhere in here
List *list = _s->_segMan->lookupList(listReference);