diff options
| author | Johannes Schickel | 2005-12-09 23:48:52 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2005-12-09 23:48:52 +0000 |
| commit | fe80cf4f99319322394706d19149e6ce512e13f2 (patch) | |
| tree | 9283fdc64f5c50f4f5f5ee705e4712a81ba84c77 | |
| parent | 5cdf1bb621f51d47c0536004335481892641c509 (diff) | |
| download | scummvm-rg350-fe80cf4f99319322394706d19149e6ce512e13f2.tar.gz scummvm-rg350-fe80cf4f99319322394706d19149e6ce512e13f2.tar.bz2 scummvm-rg350-fe80cf4f99319322394706d19149e6ce512e13f2.zip | |
Changed use of setTimerCountdown to new implemented setTimerDelay.
svn-id: r19771
| -rw-r--r-- | kyra/kyra.cpp | 5 | ||||
| -rw-r--r-- | kyra/kyra.h | 1 | ||||
| -rw-r--r-- | kyra/script_v1.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp index b83c9d5c86..daa7e28a3d 100644 --- a/kyra/kyra.cpp +++ b/kyra/kyra.cpp @@ -4436,6 +4436,11 @@ void KyraEngine::clearNextEventTickCount() { _timerNextRun = 0; } +void KyraEngine::setTimerDelay(uint8 timer, int32 countdown) { + debug(9, "setTimerDelay(%i, %d)", timer, countdown); + _timers[timer].countdown = countdown; +} + int16 KyraEngine::getTimerDelay(uint8 timer) { debug(9, "getTimerDelay(%i)", timer); return _timers[timer].countdown; diff --git a/kyra/kyra.h b/kyra/kyra.h index db9d912bc5..c202a05e83 100644 --- a/kyra/kyra.h +++ b/kyra/kyra.h @@ -210,6 +210,7 @@ public: void updateGameTimers(); void clearNextEventTickCount(); void setTimerCountdown(uint8 timer, int32 countdown); + void setTimerDelay(uint8 timer, int32 countdown); int16 getTimerDelay(uint8 timer); void enableTimer(uint8 timer); void disableTimer(uint8 timer); diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index db0b0643cb..14c1fc3f28 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -1190,7 +1190,7 @@ int KyraEngine::cmd_sceneAnimationActive(ScriptState *script) { int KyraEngine::cmd_setCharactersMovementDelay(ScriptState *script) { debug(3, "cmd_setCharactersMovementDelay(0x%X) (%d, %d)", script, stackPos(0), stackPos(1)); - setTimerCountdown(stackPos(0)+5, stackPos(1)); + setTimerDelay(stackPos(0)+5, stackPos(1)); return 0; } |