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

[antoniou79]

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:
c43abab5e8 BLADERUNNER: Spacebar key also skips cutscenes


Commit: c43abab5e8a1f603f490af878cc189f40745629e
    https://github.com/scummvm/scummvm/commit/c43abab5e8a1f603f490af878cc189f40745629e
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-03-05T22:19:25+02:00

Commit Message:
BLADERUNNER: Spacebar key also skips cutscenes

This is the original's behavior also.

Spacebar key does not skip dialogue.

Changed paths:
    engines/bladerunner/bladerunner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 7304c8c5767..85de2fa1160 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -1394,8 +1394,9 @@ void BladeRunnerEngine::handleKeyDown(Common::Event &event) {
 	if (_vqaIsPlaying
 	    && (event.kbd.keycode == Common::KEYCODE_RETURN
 	        || event.kbd.keycode == Common::KEYCODE_KP_ENTER
+	        || event.kbd.keycode == Common::KEYCODE_SPACE
 	        || event.kbd.keycode == Common::KEYCODE_ESCAPE)) {
-		// Note: Original only uses the Esc key here
+		// Note: Original allows Esc, Spacebar and Return/KP_Enter to skip cutscenes
 		_vqaStopIsRequested = true;
 		_vqaIsPlaying = false;
 
@@ -1405,6 +1406,7 @@ void BladeRunnerEngine::handleKeyDown(Common::Event &event) {
 	if (_vqaStopIsRequested
 	    && (event.kbd.keycode == Common::KEYCODE_RETURN
 	        || event.kbd.keycode == Common::KEYCODE_KP_ENTER
+	        || event.kbd.keycode == Common::KEYCODE_SPACE
 	        || event.kbd.keycode == Common::KEYCODE_ESCAPE)) {
 		 return;
 	}
@@ -1413,7 +1415,7 @@ void BladeRunnerEngine::handleKeyDown(Common::Event &event) {
 	    && (event.kbd.keycode == Common::KEYCODE_RETURN
 	        || event.kbd.keycode == Common::KEYCODE_KP_ENTER
 	        || event.kbd.keycode == Common::KEYCODE_ESCAPE)) {
-		// Note: Original only uses the Return key here
+		// Note: Original only uses the Return/KP_Enter key here
 		_actorSpeakStopIsRequested = true;
 		_actorIsSpeaking = false;