[Scummvm-git-logs] scummvm master -> 486d0da5d94d56e6227a201e724c8cc160278750

[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:
486d0da5d9 BLADERUNNER: Only use Return key to skip dialogue


Commit: 486d0da5d94d56e6227a201e724c8cc160278750
    https://github.com/scummvm/scummvm/commit/486d0da5d94d56e6227a201e724c8cc160278750
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2021-06-15T15:20:25+03:00

Commit Message:
BLADERUNNER: Only use Return key to skip dialogue

Also only use Esc key to skip video cutscenes

This is replicating the original's behavior and at least for the dialogue skipping, it fixes a few glitches (KIA screen blinking if skipping the last dialogue line with Esc key, and Zuben throwing the soup leading to a dead end, if user presses Esc fast during that sequence).

Changed paths:
    engines/bladerunner/bladerunner.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 1f761aa2c3..4434ec312a 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -1365,14 +1365,23 @@ void BladeRunnerEngine::handleKeyUp(Common::Event &event) {
 }
 
 void BladeRunnerEngine::handleKeyDown(Common::Event &event) {
-	if (_vqaIsPlaying && (event.kbd.keycode == Common::KEYCODE_ESCAPE || event.kbd.keycode == Common::KEYCODE_RETURN)) {
+	if (_vqaIsPlaying && event.kbd.keycode == Common::KEYCODE_ESCAPE) {
+		// Note: Do not use Return key to skip a VQA cutscene - Original also only uses the Esc key here
+		//       While no glitches were attirubuted to using Return for skipping cutscenes
+		//       it's ultimately better to have the original behavior here
+		//       and not have a key skipping multiple stuff at the same time.
 		_vqaStopIsRequested = true;
 		_vqaIsPlaying = false;
 
 		return;
 	}
 
-	if (_actorIsSpeaking && (event.kbd.keycode == Common::KEYCODE_ESCAPE || event.kbd.keycode == Common::KEYCODE_RETURN)) {
+	if (_actorIsSpeaking && event.kbd.keycode == Common::KEYCODE_RETURN) {
+		// Note: Do not use Esc key to skip dialogue - Original also only uses the Return key here
+		//       Using Esc to skip dialogue causes a few bad glitches such as:
+		//        - Kia dialogue will blink fast after last line spoken is skipped
+		//        - In certain sequences (eg. Zuben dumping soup on McCoy) the frames won't play correctly
+		//          and that may lead to dead end situation (for the Zuben example, the scene is locked with no exits enabled).
 		_actorSpeakStopIsRequested = true;
 		_actorIsSpeaking = false;