[Scummvm-git-logs] scummvm master -> 9d0de3e168f4975ba2974ac71031fffdd008819f

[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:
9d0de3e168 BLADERUNNER: Skip movies on keydown not keyup (#1696)


Commit: 9d0de3e168f4975ba2974ac71031fffdd008819f
    https://github.com/scummvm/scummvm/commit/9d0de3e168f4975ba2974ac71031fffdd008819f
Author: Tarek Soliman (tarek at bashasoliman.com)
Date: 2019-06-22T10:36:47+02:00

Commit Message:
BLADERUNNER: Skip movies on keydown not keyup (#1696)

* BLADERUNNER: Skip movies on keydown not keyup

* BLADERUNNER: Filter out key-repeats when skipping movies

Changed paths:
    engines/bladerunner/bladerunner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 819adab..0288af3 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -1163,13 +1163,6 @@ void BladeRunnerEngine::handleKeyUp(Common::Event &event) {
 		return;
 	}
 
-	if (_vqaIsPlaying && (event.kbd.keycode == Common::KEYCODE_ESCAPE || (event.kbd.keycode == Common::KEYCODE_RETURN && event.kbd.flags == 0))) {
-		_vqaStopIsRequested = true;
-		_vqaIsPlaying = false;
-
-		return;
-	}
-
 	if (!playerHasControl() || _isWalkingInterruptible) {
 		return;
 	}
@@ -1225,6 +1218,13 @@ void BladeRunnerEngine::handleKeyDown(Common::Event &event) {
 		return;
 	}
 
+	if (_vqaIsPlaying && !event.kbdRepeat && (event.kbd.keycode == Common::KEYCODE_ESCAPE || event.kbd.keycode == Common::KEYCODE_RETURN)) {
+		_vqaStopIsRequested = true;
+		_vqaIsPlaying = false;
+
+		return;
+	}
+
 	if (!playerHasControl() || _isWalkingInterruptible || _actorIsSpeaking || _vqaIsPlaying) {
 		return;
 	}