[Scummvm-git-logs] scummvm master -> f3bccbd6b02fc287064cb12c50a336b7f1e5d03f

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f3bccbd6b0 XEEN: Fix animation speed when Control Panel is open


Commit: f3bccbd6b02fc287064cb12c50a336b7f1e5d03f
    https://github.com/scummvm/scummvm/commit/f3bccbd6b02fc287064cb12c50a336b7f1e5d03f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-05-11T06:54:32-04:00

Commit Message:
XEEN: Fix animation speed when Control Panel is open

Changed paths:
    engines/xeen/dialogs/dialogs_control_panel.cpp


diff --git a/engines/xeen/dialogs/dialogs_control_panel.cpp b/engines/xeen/dialogs/dialogs_control_panel.cpp
index f589c8b..80d1715 100644
--- a/engines/xeen/dialogs/dialogs_control_panel.cpp
+++ b/engines/xeen/dialogs/dialogs_control_panel.cpp
@@ -61,9 +61,10 @@ int ControlPanel::execute() {
 		w.writeString("\xB""000\t000\x1");
 		w.update();
 
+		events.updateGameCounter();
+		intf.draw3d(false, false);
+
 		do {
-			events.updateGameCounter();
-			intf.draw3d(false, false);
 			w.writeString("\r");
 			drawButtons(&w);
 			w.writeString(text);
@@ -80,7 +81,7 @@ int ControlPanel::execute() {
 			checkEvents(_vm);
 			if (_vm->shouldExit())
 				return 0;
-		} while (!_buttonValue && !events.timeElapsed());
+		} while (!_buttonValue && events.timeElapsed() < 2);
 
 		switch (_buttonValue) {
 		case Common::KEYCODE_q: