[Scummvm-git-logs] scummvm master -> 15a7366ea56332b9a46ba2c8866dfef40fa0b1cb
sev-
noreply at scummvm.org
Wed Mar 18 16:21:34 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
147d593d05 TOT: Normalized keymapper action name
3980d95847 TOT: Fix typo in keymapper action key
15a7366ea5 ULTIMA: ULTIMA0: Normalized keymapper action names
Commit: 147d593d058200440417ab50c5ee228150ab6fbe
https://github.com/scummvm/scummvm/commit/147d593d058200440417ab50c5ee228150ab6fbe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-03-18T17:21:18+01:00
Commit Message:
TOT: Normalized keymapper action name
Changed paths:
engines/tot/metaengine.cpp
diff --git a/engines/tot/metaengine.cpp b/engines/tot/metaengine.cpp
index 0a79b67e427..ae9192eaf42 100644
--- a/engines/tot/metaengine.cpp
+++ b/engines/tot/metaengine.cpp
@@ -161,7 +161,7 @@ Common::KeymapArray TotMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("F1");
gameKeyMap->addAction(act);
- act = new Action("MAINMENU", _("Main menu/Exit"));
+ act = new Action("MAINMENU", _("Main menu / Exit"));
act->setCustomEngineActionEvent(kActionEscape);
act->addDefaultInputMapping("ESCAPE");
gameKeyMap->addAction(act);
Commit: 3980d95847485a5b3bcba0b744a45c7dc1cdf471
https://github.com/scummvm/scummvm/commit/3980d95847485a5b3bcba0b744a45c7dc1cdf471
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-03-18T17:21:18+01:00
Commit Message:
TOT: Fix typo in keymapper action key
Changed paths:
engines/tot/metaengine.cpp
diff --git a/engines/tot/metaengine.cpp b/engines/tot/metaengine.cpp
index ae9192eaf42..504fd489d07 100644
--- a/engines/tot/metaengine.cpp
+++ b/engines/tot/metaengine.cpp
@@ -175,7 +175,7 @@ Common::KeymapArray TotMetaEngine::initKeymaps(const char *target) const {
act = new Action("QUITCANCEL", _("Cancel quit"));
act->setCustomEngineActionEvent(kActionNo);
act->addDefaultInputMapping(defaultTotKeys[KEY_NO]);
- act->addDefaultInputMapping("JOY_KEFT_TRIGGER");
+ act->addDefaultInputMapping("JOY_LEFT_TRIGGER");
quitDialogKeyMap->addAction(act);
KeymapArray keymaps(3);
Commit: 15a7366ea56332b9a46ba2c8866dfef40fa0b1cb
https://github.com/scummvm/scummvm/commit/15a7366ea56332b9a46ba2c8866dfef40fa0b1cb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-03-18T17:21:18+01:00
Commit Message:
ULTIMA: ULTIMA0: Normalized keymapper action names
Changed paths:
engines/ultima/ultima0/metaengine.cpp
diff --git a/engines/ultima/ultima0/metaengine.cpp b/engines/ultima/ultima0/metaengine.cpp
index c7a20cf662b..749d1d0b871 100644
--- a/engines/ultima/ultima0/metaengine.cpp
+++ b/engines/ultima/ultima0/metaengine.cpp
@@ -52,12 +52,12 @@ static const KeybindingRecord MENU_KEYS[] = {
{ KEYBIND_RAPIER, "RAPIER", _s("Rapier"), "r", nullptr },
{ KEYBIND_AXE, "AXE", _s("Axe"), "a", nullptr },
{ KEYBIND_SHIELD, "SHIELD", _s("Shield"), "s", nullptr },
- { KEYBIND_BOW, "BOW", _s("Bow & Arrow"), "b", nullptr },
- { KEYBIND_AMULET, "AMULET", _s("Magic Amulet"), "m", nullptr },
- { KEYBIND_AMULET1, "AMULET1", _s("Amulet Option 1"), "1", nullptr },
- { KEYBIND_AMULET2, "AMULET2", _s("Amulet Option 2"), "2", nullptr },
- { KEYBIND_AMULET3, "AMULET3", _s("Amulet Option 3"), "3", nullptr },
- { KEYBIND_AMULET4, "AMULET4", _s("Amulet Option 4"), "4", nullptr },
+ { KEYBIND_BOW, "BOW", _s("Bow & arrow"), "b", nullptr },
+ { KEYBIND_AMULET, "AMULET", _s("Magic amulet"), "m", nullptr },
+ { KEYBIND_AMULET1, "AMULET1", _s("Amulet option 1"), "1", nullptr },
+ { KEYBIND_AMULET2, "AMULET2", _s("Amulet option 2"), "2", nullptr },
+ { KEYBIND_AMULET3, "AMULET3", _s("Amulet option 3"), "3", nullptr },
+ { KEYBIND_AMULET4, "AMULET4", _s("Amulet option 4"), "4", nullptr },
{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
};
@@ -66,24 +66,24 @@ static const KeybindingRecord OVERWORLD_KEYS[] = {
{ KEYBIND_DOWN, "DOWN", _s("South"), "DOWN", "JOY_DOWN" },
{ KEYBIND_LEFT, "LEFT", _s("West"), "LEFT", "JOY_LEFT" },
{ KEYBIND_RIGHT, "RIGHT", _s("East"), "RIGHT", "JOY_RIGHT" },
- { KEYBIND_ENTER, "ENTER", _s("Enter/Exit"), "e", "JOY_B" },
+ { KEYBIND_ENTER, "ENTER", _s("Enter / Exit"), "e", "JOY_B" },
{ KEYBIND_INFO, "INFO", _s("Info"), "z", "JOY_X" },
{ KEYBIND_QUIT, "QUIT", _s("Quit"), "q", nullptr },
- { KEYBIND_PASS, "PASS", _s("Pass/Wait"), "SPACE", nullptr },
+ { KEYBIND_PASS, "PASS", _s("Pass / Wait"), "SPACE", nullptr },
{ KEYBIND_MINIMAP, "MINIMAP", _s("Minimap"), "m", nullptr },
{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
};
static const KeybindingRecord DUNGEON_KEYS[] = {
- { KEYBIND_UP, "UP", _s("Move Forward"), "UP", "JOY_UP" },
- { KEYBIND_DOWN, "DOWN", _s("Turn Around"), "DOWN", "JOY_DOWN" },
- { KEYBIND_LEFT, "LEFT", _s("Turn Left"), "LEFT", "JOY_LEFT" },
- { KEYBIND_RIGHT, "RIGHT", _s("Turn Right"), "RIGHT", "JOY_RIGHT" },
+ { KEYBIND_UP, "UP", _s("Move forward"), "UP", "JOY_UP" },
+ { KEYBIND_DOWN, "DOWN", _s("Turn around"), "DOWN", "JOY_DOWN" },
+ { KEYBIND_LEFT, "LEFT", _s("Turn left"), "LEFT", "JOY_LEFT" },
+ { KEYBIND_RIGHT, "RIGHT", _s("Turn right"), "RIGHT", "JOY_RIGHT" },
{ KEYBIND_ATTACK, "ATTACK", _s("Attack"), "a", "JOY_A" },
- { KEYBIND_ENTER, "ENTER", _s("Enter/Exit"), "e", "JOY_B" },
+ { KEYBIND_ENTER, "ENTER", _s("Enter / Exit"), "e", "JOY_B" },
{ KEYBIND_INFO, "INFO", _s("Info"), "z", "JOY_X" },
{ KEYBIND_QUIT, "QUIT", _s("Quit"), "q", nullptr },
- { KEYBIND_PASS, "PASS", _s("Pass/Wait"), "SPACE", nullptr },
+ { KEYBIND_PASS, "PASS", _s("Pass / Wait"), "SPACE", nullptr },
{ KEYBIND_MINIMAP, "MINIMAP", _s("Minimap"), "m", nullptr },
{ KEYBIND_NONE, nullptr, nullptr, nullptr, nullptr }
};
@@ -95,33 +95,33 @@ struct KeysRecord {
};
static const KeysRecord ALL_RECORDS[] = {
- { "ultima0", _s("Basic Keys"), MINIMAL_KEYS },
- { "menu", _s("Menu Keys"), MENU_KEYS },
- { "overworld", _s("Overworld Keys"), OVERWORLD_KEYS },
- { "dungeon", _s("Dungeon Keys"), DUNGEON_KEYS },
+ { "ultima0", _s("Basic keys"), MINIMAL_KEYS },
+ { "menu", _s("Menu keys"), MENU_KEYS },
+ { "overworld", _s("Overworld keys"), OVERWORLD_KEYS },
+ { "dungeon", _s("Dungeon keys"), DUNGEON_KEYS },
{ nullptr, nullptr, nullptr }
};
static const KeysRecord MINIMAL_RECORDS[] = {
- { "ultima0", _s("Basic Keys"), MINIMAL_KEYS },
+ { "ultima0", _s("Basic keys"), MINIMAL_KEYS },
{ nullptr, nullptr, nullptr }
};
static const KeysRecord MENU_RECORDS[] = {
- { "ultima0", _s("Basic Keys"), MINIMAL_KEYS },
- { "menu", _s("Menu Keys"), MENU_KEYS },
+ { "ultima0", _s("Basic keys"), MINIMAL_KEYS },
+ { "menu", _s("Menu keys"), MENU_KEYS },
{ nullptr, nullptr, nullptr }
};
static const KeysRecord OVERWORLD_RECORDS[] = {
- { "ultima0", _s("Basic Keys"), MINIMAL_KEYS },
- { "overworld", _s("Overworld Keys"), OVERWORLD_KEYS },
+ { "ultima0", _s("Basic keys"), MINIMAL_KEYS },
+ { "overworld", _s("Overworld keys"), OVERWORLD_KEYS },
{ nullptr, nullptr, nullptr }
};
static const KeysRecord DUNGEON_RECORDS[] = {
- { "ultima0", _s("Basic Keys"), MINIMAL_KEYS },
- { "dungeon", _s("Dungeon Keys"), DUNGEON_KEYS },
+ { "ultima0", _s("Basic keys"), MINIMAL_KEYS },
+ { "dungeon", _s("Dungeon keys"), DUNGEON_KEYS },
{ nullptr, nullptr, nullptr }
};
More information about the Scummvm-git-logs
mailing list