diff options
| author | athrxx | 2011-07-29 15:57:02 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:13 +0100 |
| commit | 84900e8e50df8490fbdebc3acb25a338949f2de9 (patch) | |
| tree | f0aa2113c8ce6b7f70213758725632c540f804b9 /engines/kyra/timer_eob.cpp | |
| parent | 0e4c184e285c9b20b90536eb485a7f8a50833da3 (diff) | |
| download | scummvm-rg350-84900e8e50df8490fbdebc3acb25a338949f2de9.tar.gz scummvm-rg350-84900e8e50df8490fbdebc3acb25a338949f2de9.tar.bz2 scummvm-rg350-84900e8e50df8490fbdebc3acb25a338949f2de9.zip | |
KYRA: (EOB) - add turn undead spell, add some screen fades, fix some bugs
Diffstat (limited to 'engines/kyra/timer_eob.cpp')
| -rw-r--r-- | engines/kyra/timer_eob.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp index 903dec2102..9e03bdebcf 100644 --- a/engines/kyra/timer_eob.cpp +++ b/engines/kyra/timer_eob.cpp @@ -101,6 +101,7 @@ void EobCoreEngine::setupTimers() { _timer->addTimer(0x21, TimerV2(timerProcessMonsters), 20, true); _timer->addTimer(0x22, TimerV2(timerProcessMonsters), 20, true); _timer->addTimer(0x23, TimerV2(timerProcessMonsters), 20, true); + _timer->setNextRun(0x20, _system->getMillis()); _timer->setNextRun(0x21, _system->getMillis() + 7 * _tickLength); _timer->setNextRun(0x22, _system->getMillis() + 14 * _tickLength); _timer->setNextRun(0x23, _system->getMillis() + 14 * _tickLength); @@ -274,7 +275,6 @@ void EobCoreEngine::timerProcessMonsters(int timerNum) { updateMonsters(timerNum & 0x0f); } - void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) { int charIndex = timerNum & 0x0f; EobCharacter *c = &_characters[charIndex]; @@ -346,7 +346,8 @@ void EobCoreEngine::timerSpecialCharacterUpdate(int timerNum) { case 12: c->effectFlags &= ~0x1000; - _txt->printMessage(_characterStatusStrings12[0], -1, c->name); + if (_characterStatusStrings12) + _txt->printMessage(_characterStatusStrings12[0], -1, c->name); break; default: |