diff options
-rw-r--r-- | engines/kyra/lol.cpp | 12 | ||||
-rw-r--r-- | engines/kyra/lol.h | 2 | ||||
-rw-r--r-- | engines/kyra/scene_lol.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/script_lol.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sound_lol.cpp | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index d4a7289a95..a5e9f38ffe 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -1779,12 +1779,12 @@ uint16 *LoLEngine::getCharacterOrMonsterProtectionAgainstItems(int id) { return (id & 0x8000) ? _monsters[id & 0x7fff].properties->protectionAgainstItems : _characters[id].protectionAgainstItems; } -void LoLEngine::delay(uint32 millis, bool cUpdate, bool iUpdate) { +void LoLEngine::delay(uint32 millis, bool doUpdate, bool) { int del = (int)(millis); while (del > 0 && !shouldQuit()) { - if (cUpdate) + if (doUpdate) update(); - if (iUpdate) + else updateInput(); int step = del >= _tickLength ? _tickLength : del; _system->delayMillis(step); @@ -2402,7 +2402,7 @@ void LoLEngine::processMagicFireball(int charNum, int spellLevel) { int del = _tickLength - (_system->getMillis() - ctime); if (del > 0) - delay(del, false, true); + delay(del); _screen->checkedPageUpdate(drawPage1, drawPage2); _screen->updateScreen(); @@ -2849,7 +2849,7 @@ void LoLEngine::playSpellAnimation(WSAMovie_v2 *mov, int firstFrame, int lastFra int step = del > _tickLength ? _tickLength : del; if (!pal1 || !pal2) { - delay(step, false, true); + delay(step); del -= step; continue; } @@ -2857,7 +2857,7 @@ void LoLEngine::playSpellAnimation(WSAMovie_v2 *mov, int firstFrame, int lastFra if (!_screen->fadePaletteStep(pal1, pal2, _system->getMillis() - startTime, _tickLength * fadeDelay) && !mov) return; - delay(step, false, true); + delay(step); del -= step; } while (del > 0); diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index 53671fd837..ac0f9516d8 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -1291,7 +1291,7 @@ private: int _monsterScaleWHSize; // misc - void delay(uint32 millis, bool cUpdate = false, bool iUpdate = false); + void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false); void delayUntil(uint32 timeStamp); uint8 getRandomNumberSpecial(); diff --git a/engines/kyra/scene_lol.cpp b/engines/kyra/scene_lol.cpp index 5cec86d9f3..1a1d885163 100644 --- a/engines/kyra/scene_lol.cpp +++ b/engines/kyra/scene_lol.cpp @@ -1244,7 +1244,7 @@ void LoLEngine::pitDropScroll(int numSteps) { del = _tickLength - (_system->getMillis() - ctime); if (del > 0) - delay(del, false, true); + delay(del); } _screen->copyRegionSpecial(2, 320, 200, 112, 0, 0, 320, 200, 112, 0, 176, 120, 0); @@ -1252,7 +1252,7 @@ void LoLEngine::pitDropScroll(int numSteps) { del = _tickLength - (_system->getMillis() - ctime); if (del > 0) - delay(del, false, true); + delay(del); updateDrawPage2(); } diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp index d8cc6a3c61..2f2879959f 100644 --- a/engines/kyra/script_lol.cpp +++ b/engines/kyra/script_lol.cpp @@ -199,7 +199,7 @@ int LoLEngine::olol_moveParty(EMCState *script) { int LoLEngine::olol_delay(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_delay(%p) (%d)", (const void *)script, stackPos(0)); - delay(stackPos(0) * _tickLength, false, true); + delay(stackPos(0) * _tickLength); return 1; } diff --git a/engines/kyra/sound_lol.cpp b/engines/kyra/sound_lol.cpp index a14df2090a..d0e34a0be6 100644 --- a/engines/kyra/sound_lol.cpp +++ b/engines/kyra/sound_lol.cpp @@ -90,10 +90,10 @@ bool LoLEngine::snd_playCharacterSpeech(int id, int8 speaker, int) { return false; while (_sound->voiceIsPlaying(&_speechHandle)) - delay(_tickLength, true, false); + delay(_tickLength, true); while (_sound->allVoiceChannelsPlaying()) - delay(_tickLength, false, true); + delay(_tickLength); for (Common::List<Audio::AudioStream *>::iterator i = _speechList.begin(); i != _speechList.end(); ++i) delete *i; |