aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/timer_eob.cpp
diff options
context:
space:
mode:
authorathrxx2011-08-17 18:46:29 +0200
committerJohannes Schickel2011-12-26 16:18:14 +0100
commitf7032c126dd097e8083e0fc740c7c856e0f2dd58 (patch)
tree0d3c6917f6c27d63326ed62954e35e1c3b7df4d2 /engines/kyra/timer_eob.cpp
parentb3c8173bd46ddc831344848723598846bd5c41e8 (diff)
downloadscummvm-rg350-f7032c126dd097e8083e0fc740c7c856e0f2dd58.tar.gz
scummvm-rg350-f7032c126dd097e8083e0fc740c7c856e0f2dd58.tar.bz2
scummvm-rg350-f7032c126dd097e8083e0fc740c7c856e0f2dd58.zip
KYRA: (EOB) - fix some bugs
- fix monster movement - fix character level gain - add some static res for party transfer
Diffstat (limited to 'engines/kyra/timer_eob.cpp')
-rw-r--r--engines/kyra/timer_eob.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 61fa554193..caeae8cb29 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -115,6 +115,7 @@ void EobCoreEngine::setupTimers() {
_timer->addTimer(5, TimerV2(timerUpdateTeleporters), 10, true);
_timer->addTimer(6, TimerV2(timerUpdateFoodStatus), 1080, true);
_timer->addTimer(7, TimerV2(timerUpdateMonsterIdleAnim), 25, true);
+ _timer->resetNextRun();
}
void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt, int updateExistingTimer) {
@@ -132,6 +133,7 @@ void EobCoreEngine::setCharEventTimer(int charIndex, uint32 countdown, int evnt,
if (ntime < _timer->getNextRun(timerId))
_timer->setNextRun(timerId, ntime);
+ _timer->resetNextRun();
if (updateExistingTimer) {
bool updated = false;
@@ -194,6 +196,7 @@ void EobCoreEngine::setupCharacterTimers() {
_timer->setCountdown(0x30 | i, (nextTimer - ctime) / _tickLength);
}
}
+ _timer->resetNextRun();
}
void EobCoreEngine::advanceTimers(uint32 millis) {