[Scummvm-cvs-logs] SF.net SVN: scummvm:[45030] scummvm/trunk/engines/sci/gui/gui.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Tue Oct 13 19:17:42 CEST 2009
Revision: 45030
http://scummvm.svn.sourceforge.net/scummvm/?rev=45030&view=rev
Author: m_kiewitz
Date: 2009-10-13 17:17:40 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
SCI/newgui: canBeHere fixed, walk-anywhere in sq3 is not possible anymore
Modified Paths:
--------------
scummvm/trunk/engines/sci/gui/gui.cpp
Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp 2009-10-13 17:09:32 UTC (rev 45029)
+++ scummvm/trunk/engines/sci/gui/gui.cpp 2009-10-13 17:17:40 UTC (rev 45030)
@@ -56,7 +56,7 @@
_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 @@
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");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list