diff options
| author | Martin Kiewitz | 2009-10-13 17:17:40 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2009-10-13 17:17:40 +0000 |
| commit | 535873ba4698ae1cf883eaa2b95d5ac4788f4f26 (patch) | |
| tree | a0edcbb8f482b490f4a0d2298ea4ace4f0daefea | |
| parent | 4e0046dd1f1cd342bd0c2c8b1f7367299e117d15 (diff) | |
| download | scummvm-rg350-535873ba4698ae1cf883eaa2b95d5ac4788f4f26.tar.gz scummvm-rg350-535873ba4698ae1cf883eaa2b95d5ac4788f4f26.tar.bz2 scummvm-rg350-535873ba4698ae1cf883eaa2b95d5ac4788f4f26.zip | |
SCI/newgui: canBeHere fixed, walk-anywhere in sq3 is not possible anymore
svn-id: r45030
| -rw-r--r-- | engines/sci/gui/gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index 65d6088db1..88c0185f21 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -56,7 +56,7 @@ SciGui::SciGui(EngineState *state, SciGuiScreen *screen, SciGuiPalette *palette, _gfx = new SciGuiGfx(_s, _screen, _palette); _animate = new SciGuiAnimate(_s, _gfx, _screen, _palette); _windowMgr = new SciGuiWindowMgr(_screen, _gfx, _animate); -// _gui32 = new SciGui32(_s, _screen, _palette, _cursor); // for debug purposes +// _gui32 = new SciGui32(_s, _screen, _palette, _cursor); // for debug purposes } SciGui::SciGui() { @@ -578,7 +578,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))) { List *list = _s->_segMan->lookupList(listReference); if (!list) error("kCanBeHere called with non-list as parameter"); |