From c2d755e1606dbdb674f39481a25c3d9256341be3 Mon Sep 17 00:00:00 2001 From: Andrew Kurushin Date: Sat, 13 Aug 2005 16:27:47 +0000 Subject: fix bug #1254000 ITE: Actors duplicated at chasm scene svn-id: r18675 --- saga/animation.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/saga/animation.cpp b/saga/animation.cpp index 885fcb4385..732c32efa2 100644 --- a/saga/animation.cpp +++ b/saga/animation.cpp @@ -170,17 +170,8 @@ void Anim::play(uint16 animId, int vectorTime, bool playing) { } 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 @@ void Anim::play(uint16 animId, int vectorTime, bool playing) { 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; -- cgit v1.2.3