aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/timer_lol.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2009-03-01 14:45:30 +0000
committerFlorian Kagerer2009-03-01 14:45:30 +0000
commit7ea5cefef4fb1ef9db52cbf5df7f884770113684 (patch)
tree7ad307cd465c99268b7adc8a8054467df4e6e581 /engines/kyra/timer_lol.cpp
parent40c4733124a43fb2e921efd07a782ed1688cbc90 (diff)
downloadscummvm-rg350-7ea5cefef4fb1ef9db52cbf5df7f884770113684.tar.gz
scummvm-rg350-7ea5cefef4fb1ef9db52cbf5df7f884770113684.tar.bz2
scummvm-rg350-7ea5cefef4fb1ef9db52cbf5df7f884770113684.zip
LOL: implemented some monster related code (monsters now get placed in the maze, but they still don't do anything)
svn-id: r39039
Diffstat (limited to 'engines/kyra/timer_lol.cpp')
-rw-r--r--engines/kyra/timer_lol.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp
index ab94d97101..994c691aa8 100644
--- a/engines/kyra/timer_lol.cpp
+++ b/engines/kyra/timer_lol.cpp
@@ -35,8 +35,8 @@ void LoLEngine::setupTimers() {
debugC(9, kDebugLevelMain | kDebugLevelTimer, "LoLEngine::setupTimers()");
_timer->addTimer(0, TimerV2(timerProcessOpenDoor), 15, true);
- _timer->addTimer(0x10, TimerV2(timerSub2), 6, true);
- _timer->addTimer(0x11, TimerV2(timerSub2), 6, true);
+ _timer->addTimer(0x10, TimerV2(timerProcessMonsters), 6, true);
+ _timer->addTimer(0x11, TimerV2(timerProcessMonsters), 6, true);
_timer->setNextRun(0x11, 3);
_timer->addTimer(3, TimerV2(timerSub3), 15, true);
_timer->addTimer(4, TimerV2(timerSub4), 1, true);
@@ -58,8 +58,12 @@ void LoLEngine::timerProcessOpenDoor(int timerNum) {
}
-void LoLEngine::timerSub2(int timerNum) {
+void LoLEngine::timerProcessMonsters(int timerNum) {
+ //if (!_updateMonsters)
+ // return;
+ for (int i = timerNum & 0x0f; i < 30; i += 2)
+ updateMonster(&_monsters[i]);
}
void LoLEngine::timerSub3(int timerNum) {