diff options
author | athrxx | 2011-05-15 23:29:14 +0200 |
---|---|---|
committer | athrxx | 2011-05-15 23:29:14 +0200 |
commit | 5075d64f2e7e684aa14af1b4146e087226dbb5e8 (patch) | |
tree | 766ca436be92bcb9da4a41a53a36aefab83375fb /engines | |
parent | 0001b7a12bcf0c63ed284409051ec379cfb9a08c (diff) | |
parent | 8112247f1ad3653a157a3fa0fa43271622a3433d (diff) | |
download | scummvm-rg350-5075d64f2e7e684aa14af1b4146e087226dbb5e8.tar.gz scummvm-rg350-5075d64f2e7e684aa14af1b4146e087226dbb5e8.tar.bz2 scummvm-rg350-5075d64f2e7e684aa14af1b4146e087226dbb5e8.zip |
Merge branch 'master' of https://github.com/scummvm/scummvm
Diffstat (limited to 'engines')
-rw-r--r-- | engines/tsage/converse.cpp | 6 | ||||
-rw-r--r-- | engines/tsage/dialogs.cpp | 6 | ||||
-rw-r--r-- | engines/tsage/graphics.cpp | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp index b1e318cc1c..5fa36142e7 100644 --- a/engines/tsage/converse.cpp +++ b/engines/tsage/converse.cpp @@ -418,8 +418,10 @@ int ConversationChoiceDialog::execute(const Common::StringArray &choiceList) { Event event; while (!_vm->getEventManager()->shouldQuit()) { while (!_globals->_events.getEvent(event, EVENT_KEYPRESS | EVENT_BUTTON_DOWN | EVENT_MOUSE_MOVE) && - !_vm->getEventManager()->shouldQuit()) - ; + !_vm->getEventManager()->shouldQuit()) { + g_system->delayMillis(10); + g_system->updateScreen(); + } if (_vm->getEventManager()->shouldQuit()) break; diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp index fa9c73d07f..759deebbef 100644 --- a/engines/tsage/dialogs.cpp +++ b/engines/tsage/dialogs.cpp @@ -468,8 +468,10 @@ void InventoryDialog::execute() { while (!_vm->getEventManager()->shouldQuit()) { // Get events Event event; - while (!_globals->_events.getEvent(event) && !_vm->getEventManager()->shouldQuit()) - ; + while (!_globals->_events.getEvent(event) && !_vm->getEventManager()->shouldQuit()) { + g_system->delayMillis(10); + g_system->updateScreen(); + } if (_vm->getEventManager()->shouldQuit()) return; diff --git a/engines/tsage/graphics.cpp b/engines/tsage/graphics.cpp index 1b2e6b1137..5da00e8522 100644 --- a/engines/tsage/graphics.cpp +++ b/engines/tsage/graphics.cpp @@ -991,6 +991,8 @@ GfxButton *GfxDialog::execute(GfxButton *defaultButton) { break; } } + g_system->delayMillis(10); + g_system->updateScreen(); } _gfxManager.deactivate(); |