[Scummvm-git-logs] scummvm master -> 2287a4f607bab243ca6cb164942502c6ba82ce9d

[peterkohaut]

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:
2287a4f607 BLADERUNNER: Skip videos with Esc key only (#1690)


Commit: 2287a4f607bab243ca6cb164942502c6ba82ce9d
    https://github.com/scummvm/scummvm/commit/2287a4f607bab243ca6cb164942502c6ba82ce9d
Author: Tarek Soliman (tarek at bashasoliman.com)
Date: 2019-06-22T00:34:29+02:00

Commit Message:
BLADERUNNER: Skip videos with Esc key only (#1690)

* BLADERUNNER: Skip videos with Esc key only

Previously any keyup event skipped the intro videos (including Shift)

* BLADERUNNER: Also skip movies with Return

Alt-Return toggles fullscreen so we also make sure there's no modifiers

Changed paths:
    engines/bladerunner/bladerunner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 45bd857..819adab 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -1163,7 +1163,7 @@ void BladeRunnerEngine::handleKeyUp(Common::Event &event) {
 		return;
 	}
 
-	if (_vqaIsPlaying) {
+	if (_vqaIsPlaying && (event.kbd.keycode == Common::KEYCODE_ESCAPE || (event.kbd.keycode == Common::KEYCODE_RETURN && event.kbd.flags == 0))) {
 		_vqaStopIsRequested = true;
 		_vqaIsPlaying = false;