[Scummvm-cvs-logs] scummvm master -> 2761a9cee6cccc9030e4416d9fba4a1ff205004e

[m-kiewitz]

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:
2761a9cee6 SHERLOCK: fix flicker during EA logo intro


Commit: 2761a9cee6cccc9030e4416d9fba4a1ff205004e
    https://github.com/scummvm/scummvm/commit/2761a9cee6cccc9030e4416d9fba4a1ff205004e
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-01T13:00:29+02:00

Commit Message:
SHERLOCK: fix flicker during EA logo intro

Changed paths:
    engines/sherlock/scalpel/tsage/logo.cpp



diff --git a/engines/sherlock/scalpel/tsage/logo.cpp b/engines/sherlock/scalpel/tsage/logo.cpp
index 32a68c1..769f58c 100644
--- a/engines/sherlock/scalpel/tsage/logo.cpp
+++ b/engines/sherlock/scalpel/tsage/logo.cpp
@@ -384,15 +384,15 @@ bool Logo::show(ScalpelEngine *vm) {
 	while (!logo->finished()) {
 		logo->nextFrame();
 
-		events.wait(2);
-		events.setButtonState();
-
 		// Erase areas from previous frame, and update and re-draw objects
 		for (int idx = 0; idx < 4; ++idx)
 			logo->_objects[idx].erase();
 		for (int idx = 0; idx < 4; ++idx)
 			logo->_objects[idx].update();
 
+		events.wait(2);
+		events.setButtonState();
+
 		interrupted = vm->shouldQuit() || events.kbHit() || events._pressed;
 		if (interrupted) {
 			// Keyboard or mouse button pressed, so break out of logo display