Merge branch 'master' of https://github.com/scummvm/scummvm

scummvm · May 15, 2011 · 5075d64 · 5075d64
2 parents 0001b7a + 8112247
commit 5075d64
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -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
@@ -991,6 +991,8 @@ GfxButton *GfxDialog::execute(GfxButton *defaultButton) {
 				break;
 			}
 		}
+		g_system->delayMillis(10);
+		g_system->updateScreen();
 	}
 
 	_gfxManager.deactivate();