aboutsummaryrefslogtreecommitdiff
path: root/engines/m4/animation.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2010-06-14 03:15:58 +0000
committerPaul Gilbert2010-06-14 03:15:58 +0000
commitae0a7a667504b3356f2355aadfa6add722749ca6 (patch)
tree56a9d1daad9211f85257facba535705e394496c5 /engines/m4/animation.cpp
parentd36f6638c0fd6e5aeaf8d8ac8665d5d2d8a2575f (diff)
downloadscummvm-rg350-ae0a7a667504b3356f2355aadfa6add722749ca6.tar.gz
scummvm-rg350-ae0a7a667504b3356f2355aadfa6add722749ca6.tar.bz2
scummvm-rg350-ae0a7a667504b3356f2355aadfa6add722749ca6.zip
Added logic for animation sequences specifying a starting animation frame number
svn-id: r49642
Diffstat (limited to 'engines/m4/animation.cpp')
-rw-r--r--engines/m4/animation.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/m4/animation.cpp b/engines/m4/animation.cpp
index 9b6d5d1a6f..1d9b1161c2 100644
--- a/engines/m4/animation.cpp
+++ b/engines/m4/animation.cpp
@@ -328,6 +328,7 @@ void MadsAnimation::update() {
// Handle starting any sound for this frame
AnimMiscEntry &misc = _miscEntries[_currentFrame];
+printf("frame %d delay %d\n", _currentFrame, misc.numTicks);
if (misc.soundNum)
_vm->_sound->playSound(misc.soundNum);
@@ -449,6 +450,8 @@ void MadsAnimation::setCurrentFrame(int frameNumber) {
_currentFrame = frameNumber;
_oldFrameEntry = 0;
_freeFlag = false;
+
+ _nextScrollTimer = _nextFrameTimer = _madsVm->_currentTimer;
}
void MadsAnimation::load1(int frameNumber) {