[Scummvm-cvs-logs] SF.net SVN: scummvm:[33376] scummvm/trunk/engines/parallaction/exec_ns.cpp

[peres001 at users.sourceforge.net]

Revision: 33376
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33376&view=rev
Author:   peres001
Date:     2008-07-28 14:22:44 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
Moved validation step from revision 33363, so that it is executed for all animations.

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=33363&view=rev

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/exec_ns.cpp

Modified: scummvm/trunk/engines/parallaction/exec_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_ns.cpp	2008-07-28 14:02:46 UTC (rev 33375)
+++ scummvm/trunk/engines/parallaction/exec_ns.cpp	2008-07-28 14:22:44 UTC (rev 33376)
@@ -334,6 +334,12 @@
 		AnimationPtr anim = *it;
 		GfxObj *obj = anim->gfxobj;
 
+		// Validation is performed here, so that every animation is affected, instead that only the ones
+		// who *own* a script. In fact, some scripts can change values in other animations.
+		// The right way to do this would be to enforce validation when any variable is modified from
+		// a script.
+		anim->validateScriptVars();
+
 		if ((anim->_flags & kFlagsActive) && ((anim->_flags & kFlagsRemove) == 0))   {
 
 			if (anim->_flags & kFlagsNoMasked)
@@ -415,8 +421,6 @@
 label1:
 		if (a->_flags & kFlagsCharacter)
 			a->_z = a->_top + a->height();
-
-		a->validateScriptVars();
 	}
 
 	_modCounter++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.