diff options
| author | Colin Snover | 2016-08-20 20:59:15 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-09-29 19:39:16 -0500 |
| commit | 560af833007cd3583ceae51b58cf015390ad14ce (patch) | |
| tree | 8156a5d010e0e0d30fdea5074bbe873eec4982a6 /engines | |
| parent | bf7adaa58fcb9350add66ec0fc46139913d78eb5 (diff) | |
| download | scummvm-rg350-560af833007cd3583ceae51b58cf015390ad14ce.tar.gz scummvm-rg350-560af833007cd3583ceae51b58cf015390ad14ce.tar.bz2 scummvm-rg350-560af833007cd3583ceae51b58cf015390ad14ce.zip | |
SCI: Move SciEngine::sleep to correct source file
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/event.cpp | 21 | ||||
| -rw-r--r-- | engines/sci/sci.cpp | 19 |
2 files changed, 19 insertions, 21 deletions
diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp index 550cd46d48..43db00c566 100644 --- a/engines/sci/event.cpp +++ b/engines/sci/event.cpp @@ -402,25 +402,4 @@ SciEvent EventManager::getSciEvent(uint32 mask) { return event; } - -void SciEngine::sleep(uint32 msecs) { - uint32 time; - const uint32 wakeUpTime = g_system->getMillis() + msecs; - - while (true) { - // let backend process events and update the screen - _eventMan->getSciEvent(SCI_EVENT_PEEK); - time = g_system->getMillis(); - if (time + 10 < wakeUpTime) { - g_system->delayMillis(10); - } else { - if (time < wakeUpTime) - g_system->delayMillis(wakeUpTime - time); - break; - } - - } -} - - } // End of namespace Sci diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 86c0cffe15..8e330f274b 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -955,6 +955,25 @@ int SciEngine::inQfGImportRoom() const { return 0; } +void SciEngine::sleep(uint32 msecs) { + uint32 time; + const uint32 wakeUpTime = g_system->getMillis() + msecs; + + for (;;) { + // let backend process events and update the screen + _eventMan->getSciEvent(SCI_EVENT_PEEK); + time = g_system->getMillis(); + if (time + 10 < wakeUpTime) { + g_system->delayMillis(10); + } else { + if (time < wakeUpTime) + g_system->delayMillis(wakeUpTime - time); + break; + } + + } +} + void SciEngine::setLauncherLanguage() { if (_gameDescription->flags & ADGF_ADDENGLISH) { // If game is multilingual |