[Scummvm-git-logs] scummvm master -> 6e8a0146fbf8ab375824746db71f6b71961cdf54

[bluegr]

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:
6e8a0146fb AGOS: Fix entering save game name, after keymapper changes


Commit: 6e8a0146fbf8ab375824746db71f6b71961cdf54
    https://github.com/scummvm/scummvm/commit/6e8a0146fbf8ab375824746db71f6b71961cdf54
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-04T17:59:46+02:00

Commit Message:
AGOS: Fix entering save game name, after keymapper changes

We need to disable the keymapper while entering a save game name.
This was addressed for some, but not all AGOS games in commit
c5422d4aab06b1e4b781d381effc96bf3d8d2462, in all cases where
userGameGetKey() is used

Changed paths:
    engines/agos/saveload.cpp


diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 8794c7e5568..b2095d1e468 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -496,6 +496,9 @@ void AGOSEngine_Elvira2::userGame(bool load) {
 
 	listSaveGames();
 
+	Common::Keymapper *keymapper = AGOSEngine::getEventManager()->getKeymapper();
+	keymapper->getKeymap("game-shortcuts")->setEnabled(false);
+
 	if (!load) {
 		WindowBlock *window = _windowArray[num];
 		int16 slot = -1;
@@ -567,6 +570,8 @@ get_out:;
 
 	if (getGameType() == GType_ELVIRA2)
 		restartAnimation();
+
+	keymapper->getKeymap("game-shortcuts")->setEnabled(true);
 }
 
 int AGOSEngine_Elvira2::userGameGetKey(bool *b, uint maxChar) {