aboutsummaryrefslogtreecommitdiff
path: root/saga/animation.cpp
diff options
context:
space:
mode:
authorAndrew Kurushin2005-06-25 15:55:43 +0000
committerAndrew Kurushin2005-06-25 15:55:43 +0000
commit353e8586d478c60f2da5d1d95ece50e98b044574 (patch)
treeb66bc36410015859ac1240fb5772d1be59f731cd /saga/animation.cpp
parent003081fd5377f9daf32fcd18abe957f577b2bb81 (diff)
downloadscummvm-rg350-353e8586d478c60f2da5d1d95ece50e98b044574.tar.gz
scummvm-rg350-353e8586d478c60f2da5d1d95ece50e98b044574.tar.bz2
scummvm-rg350-353e8586d478c60f2da5d1d95ece50e98b044574.zip
fix animation timings (now Shiala scene not stucks)
svn-id: r18463
Diffstat (limited to 'saga/animation.cpp')
-rw-r--r--saga/animation.cpp7
1 files changed, 4 insertions, 3 deletions
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;
}
}