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

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
eb38b6e86a TSAGE: BLUEFORCE: Fix submitting password text


Commit: eb38b6e86ab00ebe6eec05d270cea1715374cb3e
    https://github.com/scummvm/scummvm/commit/eb38b6e86ab00ebe6eec05d270cea1715374cb3e
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-05-18T15:00:05+03:00

Commit Message:
TSAGE: BLUEFORCE: Fix submitting password text

Adds a case for handling the EVENT_CUSTOM_ACTIONSTART of type kActionReturn when in password input mode

This will make the key mapped to the "return" action (by default being the ENTER key) work for submitting the password.
If the ENTER key is not mapped to some (other) action it can also be used to submit the password.
There is still the issue of ScummVM setting letter keys (w for walk, l for look, u for use, t for talk) as default keymaps
for "verb" in-game actions, which will not allow the player to enter those letters unless the player remaps the relevant keymaps.
These letters are not used in the valid password.

This is a quick fix for issue https://bugs.scummvm.org/ticket/15917

A complementary fix would be to use non-letter keys for the default keymaps to the verb actions to free up the "l", "w", "u" and "t",
but then the default keymaps for those won't be as intuitive.

An alternative fix would be disabling and re-enabling the keymapper for the "game-shortcuts" group but that comes with more potential issues:
- When should it be re-enabled to avoid inconsistent state if loading/saving within/outside the password input mode?
- Should the keymaps be re-organized to have a group with only the ScummVM-exclusive keymaps for verb actions (ie. which do not exist in the original game), so that we could isolate disabling and enabling those only, since the original game does allow other hotkey actions to be performed in the computer "scene" (including password input mode) like F1 (for the "help" popup) and the keys for save, load, restart, quit, pause, sound?
- The player could potentially still map letter keys to keymapper actions (enabled in the password mode), which would still conflicting with allowing free typing.

Changed paths:
    engines/tsage/blue_force/blueforce_scenes5.cpp


diff --git a/engines/tsage/blue_force/blueforce_scenes5.cpp b/engines/tsage/blue_force/blueforce_scenes5.cpp
index 18a6c4ef09a..795572c87e1 100644
--- a/engines/tsage/blue_force/blueforce_scenes5.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes5.cpp
@@ -1644,6 +1644,20 @@ void Scene570::PasswordEntry::process(Event &event) {
 	case EVENT_BUTTON_DOWN:
 		event.handled = true;
 		break;
+	case EVENT_CUSTOM_ACTIONSTART:
+		// Custom action to submit a password text.
+		// The code handling this custom action is identical
+		// to the code for handling event type EVENT_KEYPRESS
+		// when event.kdb.keycode == Common::KEYCODE_RETURN.
+		if (event.customType == kActionReturn)  {
+			// Finished entering password
+			_passwordText.remove();
+			_entryText.remove();
+
+			checkPassword();
+			remove();
+		}
+		break;
 	default:
 		break;
 	}