[Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.54,1.55

[Andrew Kurushin]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5017

Modified Files:
	animation.cpp 
Log Message:
fix bug #1254000 ITE: Actors duplicated at chasm scene

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- animation.cpp	10 Aug 2005 15:31:15 -0000	1.54
+++ animation.cpp	13 Aug 2005 16:27:47 -0000	1.55
@@ -170,17 +170,8 @@
 
 	} else {
 		// Animation done playing
-		if (anim->linkId != -1) {
-			// If this animation has a link, follow it
-			anim->currentFrame = 0;
-			anim->completed = 0;
-			anim->state = ANIM_PAUSE;
-
-		} else {
-			// No link, stop playing
-			anim->currentFrame = anim->maxFrame;
-			anim->state = ANIM_PAUSE;
-
+		anim->state = ANIM_PAUSE;
+		if (anim->linkId == -1) {
 			if (anim->flags & ANIM_ENDSCENE) {
 				// This animation ends the scene
 				event.type = kEvTOneshot;
@@ -198,6 +189,7 @@
 		linkAnim = getAnimation(anim->linkId);
 
 		debug(5, "Animation ended going to %d", anim->linkId);
+		linkAnim->cycles = anim->cycles;
 		linkAnim->currentFrame = 0;
 		linkAnim->completed = 0;
 		linkAnim->state = ANIM_PLAYING;