From 9e5f9a88c3156205ae744b8a3ba7394cb40f71ea Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Thu, 23 May 2024 18:49:06 +0000 Subject: [PATCH] Fix renamed end turn shortcut --- client/gui/ShortcutHandler.cpp | 4 +--- config/widgets/adventureMap.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/gui/ShortcutHandler.cpp b/client/gui/ShortcutHandler.cpp index dd83f9937..3a5033882 100644 --- a/client/gui/ShortcutHandler.cpp +++ b/client/gui/ShortcutHandler.cpp @@ -159,6 +159,7 @@ EShortcut ShortcutHandler::findShortcut(const std::string & identifier ) const {"lobbyToggleChat", EShortcut::LOBBY_TOGGLE_CHAT }, {"lobbyAdditionalOptions", EShortcut::LOBBY_ADDITIONAL_OPTIONS }, {"lobbySelectScenario", EShortcut::LOBBY_SELECT_SCENARIO }, + {"gameEndTurn", EShortcut::ADVENTURE_END_TURN }, // compatibility ID - extra's use this string {"adventureEndTurn", EShortcut::ADVENTURE_END_TURN }, {"adventureLoadGame", EShortcut::ADVENTURE_LOAD_GAME }, {"adventureSaveGame", EShortcut::ADVENTURE_SAVE_GAME }, @@ -339,10 +340,7 @@ EShortcut ShortcutHandler::findShortcut(const std::string & identifier ) const std::vector assignedShortcuts; std::vector missingShortcuts; for (auto const & entry : shortcutNames) - { - assert(!vstd::contains(assignedShortcuts, entry.second)); assignedShortcuts.push_back(entry.second); - } for (EShortcut id = vstd::next(EShortcut::NONE, 1); id < EShortcut::AFTER_LAST; id = vstd::next(id, 1)) if (!vstd::contains(assignedShortcuts, id)) diff --git a/config/widgets/adventureMap.json b/config/widgets/adventureMap.json index a398ad697..f3469b571 100644 --- a/config/widgets/adventureMap.json +++ b/config/widgets/adventureMap.json @@ -234,7 +234,7 @@ "type": "adventureMapButton", "name": "buttonEndTurn", "image" : "IAM001.DEF", - "hotkey": "gameEndTurn", + "hotkey": "adventureEndTurn", "help" : "core.help.302", "playerColored" : true, "area": { "top" : 160, "left": 0, "width" : 64, "height" : 32 }