aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/timer_lok.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2011-04-07 00:08:47 +0200
committerJohannes Schickel2011-04-07 00:11:36 +0200
commit6d0bb19a51ac2996e8563f176ae2f2af1925369e (patch)
tree14d8058b0234a41c5c0ddf02f13835e3518af534 /engines/kyra/timer_lok.cpp
parentf4dde644064cd717cd82b3cf873d866a58d15a23 (diff)
downloadscummvm-rg350-6d0bb19a51ac2996e8563f176ae2f2af1925369e.tar.gz
scummvm-rg350-6d0bb19a51ac2996e8563f176ae2f2af1925369e.tar.bz2
scummvm-rg350-6d0bb19a51ac2996e8563f176ae2f2af1925369e.zip
KYRA: Cleanup static variable usage in LoK.
Diffstat (limited to 'engines/kyra/timer_lok.cpp')
-rw-r--r--engines/kyra/timer_lok.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/kyra/timer_lok.cpp b/engines/kyra/timer_lok.cpp
index 6f4948c279..85b98be724 100644
--- a/engines/kyra/timer_lok.cpp
+++ b/engines/kyra/timer_lok.cpp
@@ -75,7 +75,6 @@ void KyraEngine_LoK::setupTimers() {
}
void KyraEngine_LoK::timerUpdateHeadAnims(int timerNum) {
- static int8 currentFrame = 0;
static const int8 frameTable[] = {
4, 5, 4, 5, 4, 5, 0, 1,
4, 5, 4, 4, 6, 4, 8, 1,
@@ -85,11 +84,11 @@ void KyraEngine_LoK::timerUpdateHeadAnims(int timerNum) {
if (_talkingCharNum < 0)
return;
- _currHeadShape = frameTable[currentFrame];
- currentFrame++;
+ _currHeadShape = frameTable[_currentHeadFrameTableIndex];
+ ++_currentHeadFrameTableIndex;
- if (frameTable[currentFrame] == -1)
- currentFrame = 0;
+ if (frameTable[_currentHeadFrameTableIndex] == -1)
+ _currentHeadFrameTableIndex = 0;
_animator->animRefreshNPC(0);
_animator->animRefreshNPC(_talkingCharNum);