diff options
author | Florian Kagerer | 2009-02-21 23:20:14 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-02-21 23:20:14 +0000 |
commit | b5b4cb66a173bfea3792058e160f6b9a0b30e2ff (patch) | |
tree | 4d2627ad3245dbe95ad70571e2dcdbebe835145a /engines/kyra/lol.cpp | |
parent | b18ccb755a1fd7b39618d3f64f997d7123f81c26 (diff) | |
download | scummvm-rg350-b5b4cb66a173bfea3792058e160f6b9a0b30e2ff.tar.gz scummvm-rg350-b5b4cb66a173bfea3792058e160f6b9a0b30e2ff.tar.bz2 scummvm-rg350-b5b4cb66a173bfea3792058e160f6b9a0b30e2ff.zip |
LOL: implemented timers (only text fading for now)
svn-id: r38766
Diffstat (limited to 'engines/kyra/lol.cpp')
-rw-r--r-- | engines/kyra/lol.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 45283e9430..7a2a91d62f 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -27,6 +27,7 @@ #include "kyra/screen_lol.h" #include "kyra/resource.h" #include "kyra/sound.h" +#include "kyra/timer.h" #include "kyra/util.h" #include "sound/voc.h" @@ -773,11 +774,11 @@ void LoLEngine::runLoop() { while (!shouldQuit() && _runFlag) { if (_nextScriptFunc) { - runSceneScript(_nextScriptFunc, 2); + runLevelScript(_nextScriptFunc, 2); _nextScriptFunc = 0; } - //updateTimers(); + _timer->update(); //checkFloatingPointerRegions(); gui_updateInput(); @@ -1022,7 +1023,7 @@ void LoLEngine::initTextFading(int textType, int clearField) { _screen->clearDim(3); _fadeText = false; - //initGuiUnk(11); + _timer->disable(11); } void LoLEngine::charCallback4(int redraw) { @@ -1214,7 +1215,7 @@ void LoLEngine::fadeText() { _screen->clearDim(3); - ///initGuiUnk(11); + _timer->disable(11); _fadeText = false; } |