From 353e8586d478c60f2da5d1d95ece50e98b044574 Mon Sep 17 00:00:00 2001
From: Andrew Kurushin
Date: Sat, 25 Jun 2005 15:55:43 +0000
Subject: fix animation timings (now Shiala scene not stucks)

svn-id: r18463
---
 saga/animation.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'saga/animation.cpp')

diff --git a/saga/animation.cpp b/saga/animation.cpp
index 6ce761187e..b3a48a3b80 100644
--- a/saga/animation.cpp
+++ b/saga/animation.cpp
@@ -133,7 +133,6 @@ void Anim::play(uint16 animId, int vectorTime, bool playing) {
 
 	anim = getAnimation(animId);
 
-
 	_vm->_render->getBufferInfo(&buf_info);
 	displayBuffer = buf_info.bg_buf;
 
@@ -171,7 +170,9 @@ void Anim::play(uint16 animId, int vectorTime, bool playing) {
 		}
 
 		anim->currentFrame++;
-		anim->completed++;
+		if (anim->completed != 65535) {
+			anim->completed++;
+		}
 
 		if (anim->currentFrame > anim->maxFrame) {
 			anim->currentFrame = anim->loopFrame;
@@ -182,7 +183,7 @@ void Anim::play(uint16 animId, int vectorTime, bool playing) {
 				anim->cur_frame_len = anim->resourceLength - SAGA_FRAME_HEADER_LEN;
 			}
 			
-			if (anim->flags & ANIM_STOPPING || anim->currentFrame == (uint16)-1) {
+			if (anim->flags & ANIM_STOPPING || anim->currentFrame == -1) {
 				anim->state = ANIM_PAUSE;
 			}
 		}
-- 
cgit v1.2.3