[Scummvm-cvs-logs] SF.net SVN: scummvm: [28737] scummvm/trunk/engines/saga/animation.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Aug 26 01:29:53 CEST 2007


Revision: 28737
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28737&view=rev
Author:   thebluegr
Date:     2007-08-25 16:29:53 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
Always reset an animation when it's done playing

Modified Paths:
--------------
    scummvm/trunk/engines/saga/animation.cpp

Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp	2007-08-25 23:19:55 UTC (rev 28736)
+++ scummvm/trunk/engines/saga/animation.cpp	2007-08-25 23:29:53 UTC (rev 28737)
@@ -500,6 +500,9 @@
 		_vm->_frameCount += 100;	// make sure the waiting thread stops waiting
 		// Animation done playing
 		anim->state = ANIM_PAUSE;
+		anim->currentFrame = 0;
+		anim->completed = 0;
+
 		if (anim->linkId == -1) {
 			if (anim->flags & ANIM_FLAG_ENDSCENE) {
 				// This animation ends the scene
@@ -510,9 +513,6 @@
 				_vm->_events->queue(&event);
 			}
 			return;
-		} else {
-			anim->currentFrame = 0;
-			anim->completed = 0;
 		}
 	}
 


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