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

[sev-]

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:
f113a00141 GRIFFON: Allow skipping logos with ESC


Commit: f113a00141940477db0bd9aeffc554fd8a72c57e
    https://github.com/scummvm/scummvm/commit/f113a00141940477db0bd9aeffc554fd8a72c57e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-15T00:52:58+01:00

Commit Message:
GRIFFON: Allow skipping logos with ESC

Changed paths:
    engines/griffon/cutscenes.cpp


diff --git a/engines/griffon/cutscenes.cpp b/engines/griffon/cutscenes.cpp
index c4612d4..b80481c 100644
--- a/engines/griffon/cutscenes.cpp
+++ b/engines/griffon/cutscenes.cpp
@@ -155,7 +155,13 @@ void GriffonEngine::showLogos() {
 		g_system->copyRectToScreen(_videoBuffer->getPixels(), _videoBuffer->pitch, 0, 0, _videoBuffer->w, _videoBuffer->h);
 		g_system->updateScreen();
 
-		POLL_AND_CHECK_QUIT();
+		if (g_system->getEventManager()->pollEvent(_event)) {
+
+			if (_event.kbd.keycode == Common::KEYCODE_ESCAPE)
+				return;
+
+			CHECK_QUIT();
+		}
 
 		_ticksPassed = _ticks;
 		_ticks = g_system->getMillis();