diff options
| author | Max Horn | 2010-02-23 22:44:46 +0000 |
|---|---|---|
| committer | Max Horn | 2010-02-23 22:44:46 +0000 |
| commit | 02201e937ab7a5d408b4804225affb7ce0251cce (patch) | |
| tree | 44c83f861944c4137c44e33c7c4f066f51843bc7 /engines/sci/graphics | |
| parent | da95a9820362f50477b35f9f95fd299eacfd04b2 (diff) | |
| download | scummvm-rg350-02201e937ab7a5d408b4804225affb7ce0251cce.tar.gz scummvm-rg350-02201e937ab7a5d408b4804225affb7ce0251cce.tar.bz2 scummvm-rg350-02201e937ab7a5d408b4804225affb7ce0251cce.zip | |
SCI: Move SciGui::wait to EngineState::wait
svn-id: r48118
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/gui.cpp | 9 | ||||
| -rw-r--r-- | engines/sci/graphics/gui32.cpp | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/engines/sci/graphics/gui.cpp b/engines/sci/graphics/gui.cpp index c5ce6672a1..3316fadb56 100644 --- a/engines/sci/graphics/gui.cpp +++ b/engines/sci/graphics/gui.cpp @@ -97,14 +97,7 @@ void SciGui::init(bool usesOldGfxFunctions) { } void SciGui::wait(int16 ticks) { - uint32 time; - - time = g_system->getMillis(); - _s->r_acc = make_reg(0, ((long)time - (long)_s->last_wait_time) * 60 / 1000); - _s->last_wait_time = time; - - ticks *= g_debug_sleeptime_factor; - kernel_sleep(_s->_event, ticks * 1000 / 60); + _s->wait(ticks); } void SciGui::textSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight) { diff --git a/engines/sci/graphics/gui32.cpp b/engines/sci/graphics/gui32.cpp index 13bf062efb..4b72050d0b 100644 --- a/engines/sci/graphics/gui32.cpp +++ b/engines/sci/graphics/gui32.cpp @@ -27,7 +27,6 @@ #include "common/util.h" #include "sci/sci.h" -#include "sci/debug.h" // for g_debug_sleeptime_factor #include "sci/event.h" #include "sci/engine/state.h" #include "sci/engine/selector.h" |