[Scummvm-cvs-logs] SF.net SVN: scummvm:[45244] scummvm/trunk/engines/sci/gui/gui_animate.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon Oct 19 16:33:49 CEST 2009
Revision: 45244
http://scummvm.svn.sourceforge.net/scummvm/?rev=45244&view=rev
Author: thebluegr
Date: 2009-10-19 14:33:48 +0000 (Mon, 19 Oct 2009)
Log Message:
-----------
Made the check for global var 84 more generic (checking for the fastCast object)
Modified Paths:
--------------
scummvm/trunk/engines/sci/gui/gui_animate.cpp
Modified: scummvm/trunk/engines/sci/gui/gui_animate.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_animate.cpp 2009-10-19 13:26:13 UTC (rev 45243)
+++ scummvm/trunk/engines/sci/gui/gui_animate.cpp 2009-10-19 14:33:48 UTC (rev 45244)
@@ -66,13 +66,14 @@
while (curNode) {
curObject = curNode->value;
- if (_s->_gameName == "kq5") {
- // This is special to King's Quest 5, globalVar 84 aborts kAnimate completely. If we dont do this
- // sometimes animation cels will appear within talking boxes
- if (_s->script_000->_localsBlock->_locals[84].toUint16()) {
+ // Check if the game has a fastCast object
+ // This check is needed so that animation cels won't appear within speech boxes
+ reg_t global84 = _s->script_000->_localsBlock->_locals[84];
+
+ if (!global84.isNull())
+ if (!strcmp(_s->_segMan->getObjectName(global84), "fastCast"))
return false;
- }
- }
+
signal = GET_SEL32V(segMan, curObject, signal);
if (!(signal & SCI_ANIMATE_SIGNAL_FROZEN)) {
// Call .doit method of that object
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