[Scummvm-cvs-logs] SF.net SVN: scummvm:[45800] scummvm/trunk/engines/teenagent/scene.cpp

megath at users.sourceforge.net megath at users.sourceforge.net
Tue Nov 10 08:29:07 CET 2009


Revision: 45800
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45800&view=rev
Author:   megath
Date:     2009-11-10 07:29:06 +0000 (Tue, 10 Nov 2009)

Log Message:
-----------
added special animation 0 case

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/scene.cpp

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-11-10 05:16:34 UTC (rev 45799)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-11-10 07:29:06 UTC (rev 45800)
@@ -672,8 +672,13 @@
 			break;
 
 		case SceneEvent::kPlayAnimation:
-			debug(0, "playing animation %u in slot %u", current_event.animation, current_event.slot & 3);
-			playAnimation(current_event.slot & 3, current_event.animation, (current_event.slot & 0x80) != 0, (current_event.slot & 0x40) != 0, (current_event.slot & 0x20) != 0);
+			if (current_event.animation != 0) {
+				debug(0, "playing animation %u in slot %u", current_event.animation, current_event.slot & 3);
+				playAnimation(current_event.slot & 3, current_event.animation, (current_event.slot & 0x80) != 0, (current_event.slot & 0x40) != 0, (current_event.slot & 0x20) != 0);
+			} else {
+				debug(0, "cancelling animation in slot %u", current_event.slot & 3);
+				custom_animation[current_event.slot & 3].free();
+			}
 			current_event.clear();
 			break;
 


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