games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity

Fix renamed end turn shortcut

Browse Source
This commit is contained in:
Ivan Savenko 2024-05-23 18:49:06 +00:00
parent 7a6540ec2f
commit 9e5f9a88c3
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/gui/ShortcutHandler.cpp
View File

@ -159,6 +159,7 @@ EShortcut ShortcutHandler::findShortcut(const std::string & identifier ) const
{"lobbyToggleChat", EShortcut::LOBBY_TOGGLE_CHAT }, {"lobbyToggleChat", EShortcut::LOBBY_TOGGLE_CHAT },
{"lobbyAdditionalOptions", EShortcut::LOBBY_ADDITIONAL_OPTIONS }, {"lobbyAdditionalOptions", EShortcut::LOBBY_ADDITIONAL_OPTIONS },
{"lobbySelectScenario", EShortcut::LOBBY_SELECT_SCENARIO }, {"lobbySelectScenario", EShortcut::LOBBY_SELECT_SCENARIO },
{"gameEndTurn", EShortcut::ADVENTURE_END_TURN }, // compatibility ID - extra's use this string
{"adventureEndTurn", EShortcut::ADVENTURE_END_TURN }, {"adventureEndTurn", EShortcut::ADVENTURE_END_TURN },
{"adventureLoadGame", EShortcut::ADVENTURE_LOAD_GAME }, {"adventureLoadGame", EShortcut::ADVENTURE_LOAD_GAME },
{"adventureSaveGame", EShortcut::ADVENTURE_SAVE_GAME }, {"adventureSaveGame", EShortcut::ADVENTURE_SAVE_GAME },
@ -339,10 +340,7 @@ EShortcut ShortcutHandler::findShortcut(const std::string & identifier ) const
std::vector<EShortcut> assignedShortcuts; std::vector<EShortcut> assignedShortcuts;
std::vector<EShortcut> missingShortcuts; std::vector<EShortcut> missingShortcuts;
for (auto const & entry : shortcutNames) for (auto const & entry : shortcutNames)
{
assert(!vstd::contains(assignedShortcuts, entry.second));
assignedShortcuts.push_back(entry.second); assignedShortcuts.push_back(entry.second);
}
for (EShortcut id = vstd::next(EShortcut::NONE, 1); id < EShortcut::AFTER_LAST; id = vstd::next(id, 1)) for (EShortcut id = vstd::next(EShortcut::NONE, 1); id < EShortcut::AFTER_LAST; id = vstd::next(id, 1))
if (!vstd::contains(assignedShortcuts, id)) if (!vstd::contains(assignedShortcuts, id))

2
config/widgets/adventureMap.json
View File

@ -234,7 +234,7 @@
"type": "adventureMapButton", "type": "adventureMapButton",
"name": "buttonEndTurn", "name": "buttonEndTurn",
"image" : "IAM001.DEF", "image" : "IAM001.DEF",
"hotkey": "gameEndTurn", "hotkey": "adventureEndTurn",
"help" : "core.help.302", "help" : "core.help.302",
"playerColored" : true, "playerColored" : true,
"area": { "top" : 160, "left": 0, "width" : 64, "height" : 32 } "area": { "top" : 160, "left": 0, "width" : 64, "height" : 32 }