[Scummvm-git-logs] scummvm master -> efc7bf67d2652d2c95d19a29d7224e55e537a532
sev-
noreply at scummvm.org
Sat Feb 21 20:47:10 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
328033a1ca Revert "I18N: "Move backwards" -> "Move backward" for keymapper actions"
efc7bf67d2 I18N: "Move backward" -> "Move backwards" for keymapper actions
Commit: 328033a1cab6d53368a7fb4c89c2158cda22d7fb
https://github.com/scummvm/scummvm/commit/328033a1cab6d53368a7fb4c89c2158cda22d7fb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-21T21:45:23+01:00
Commit Message:
Revert "I18N: "Move backwards" -> "Move backward" for keymapper actions"
This reverts commit d021299d3b4e24bcd07e73e17a3f8af0ed87ed81.
Actually, it should be the other way round
Changed paths:
engines/kyra/engine/eobcommon.cpp
engines/kyra/engine/lol.cpp
engines/mohawk/riven.cpp
engines/twine/metaengine.cpp
engines/wintermute/keymapper_tables.h
diff --git a/engines/kyra/engine/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp
index 0d9d6a620e3..c3ff17a93ef 100644
--- a/engines/kyra/engine/eobcommon.cpp
+++ b/engines/kyra/engine/eobcommon.cpp
@@ -369,7 +369,7 @@ Common::KeymapArray EoBCoreEngine::initKeymaps(const Common::String &gameId) {
addKeymapAction(keyMap, Common::kStandardActionLeftClick, _("Left click"), &Common::Action::setLeftClickEvent, "MOUSE_LEFT", "JOY_A");
addKeymapAction(keyMap, Common::kStandardActionRightClick, _("Right click"), &Common::Action::setRightClickEvent, "MOUSE_RIGHT", "JOY_B");
addKeymapAction(keyMap, "MVF", _("Move forward"), Common::KeyState(Common::KEYCODE_UP), "UP", "JOY_UP");
- addKeymapAction(keyMap, "MVB", _("Move backward"), Common::KeyState(Common::KEYCODE_DOWN), "DOWN", "JOY_DOWN");
+ addKeymapAction(keyMap, "MVB", _("Move backwards"), Common::KeyState(Common::KEYCODE_DOWN), "DOWN", "JOY_DOWN");
addKeymapAction(keyMap, "MVL", _("Move left"), Common::KeyState(Common::KEYCODE_LEFT), "LEFT", "JOY_LEFT_TRIGGER");
addKeymapAction(keyMap, "MVR", _("Move right"), Common::KeyState(Common::KEYCODE_RIGHT), "RIGHT", "JOY_RIGHT_TRIGGER");
addKeymapAction(keyMap, "TL", _("Turn left"), Common::KeyState(Common::KEYCODE_HOME), "HOME", "JOY_LEFT");
@@ -754,7 +754,7 @@ void EoBCoreEngine::runLoop() {
_runFlag = true;
while (!shouldQuit() && _runFlag) {
- uint32 frameEnd = _system->getMillis() + 8;
+ uint32 frameEnd = _system->getMillis() + 8;
checkPartyStatus(true);
checkInput(_activeButtons, true, 0);
removeInputTop();
diff --git a/engines/kyra/engine/lol.cpp b/engines/kyra/engine/lol.cpp
index 9f00b6ab04f..44fbb1bbf20 100644
--- a/engines/kyra/engine/lol.cpp
+++ b/engines/kyra/engine/lol.cpp
@@ -508,7 +508,7 @@ Common::KeymapArray LoLEngine::initKeymaps() {
addKeymapAction(keyMap2, "AT3", _("Attack 3"), Common::KeyState(Common::KEYCODE_F3, Common::ASCII_F3), "F3", "JOY_LEFT_SHOULDER");
addKeymapAction(keyMap2, "MAP", _("Show map"), Common::KeyState(Common::KEYCODE_m, 'm'), "m", "");
addKeymapAction(keyMap2, "MVF", _("Move forward"), Common::KeyState(Common::KEYCODE_UP), "UP", "JOY_UP");
- addKeymapAction(keyMap2, "MVB", _("Move backward"), Common::KeyState(Common::KEYCODE_DOWN), "DOWN", "JOY_DOWN");
+ addKeymapAction(keyMap2, "MVB", _("Move backwards"), Common::KeyState(Common::KEYCODE_DOWN), "DOWN", "JOY_DOWN");
addKeymapAction(keyMap2, "SLL", _("Slide left"), Common::KeyState(Common::KEYCODE_LEFT), "LEFT", "JOY_LEFT_TRIGGER");
addKeymapAction(keyMap2, "SLR", _("Slide right"), Common::KeyState(Common::KEYCODE_RIGHT), "RIGHT", "JOY_RIGHT_TRIGGER");
addKeymapAction(keyMap2, "TL", _("Turn left"), Common::KeyState(Common::KEYCODE_HOME), "HOME", "JOY_LEFT");
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 3a3499084f7..8cf4d62543a 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -892,7 +892,7 @@ Common::KeymapArray MohawkEngine_Riven::initKeymaps(const char *target) {
act->setCustomEngineActionEvent(kRivenActionMoveForwardRight);
engineKeyMap->addAction(act);
- act = new Action(kStandardActionMoveDown, _("Move backward"));
+ act = new Action(kStandardActionMoveDown, _("Move backwards"));
act->setCustomEngineActionEvent(kRivenActionMoveBack);
act->addDefaultInputMapping("DOWN");
act->addDefaultInputMapping("JOY_DOWN");
diff --git a/engines/twine/metaengine.cpp b/engines/twine/metaengine.cpp
index b40d904bb07..f4fdba51123 100644
--- a/engines/twine/metaengine.cpp
+++ b/engines/twine/metaengine.cpp
@@ -336,7 +336,7 @@ Common::KeymapArray TwinEMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("JOY_UP");
gameKeyMap->addAction(act);
- act = new Action("MOVEBACKWARD", _("Move backward"));
+ act = new Action("MOVEBACKWARD", _("Move backwards"));
act->setCustomEngineActionEvent(TwinEActionType::MoveBackward);
act->addDefaultInputMapping("DOWN");
act->addDefaultInputMapping("KP2");
diff --git a/engines/wintermute/keymapper_tables.h b/engines/wintermute/keymapper_tables.h
index 73132c172ee..69bc85a39f8 100644
--- a/engines/wintermute/keymapper_tables.h
+++ b/engines/wintermute/keymapper_tables.h
@@ -152,7 +152,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
act->addDefaultInputMapping("JOY_UP"); // extra joy
gameKeyMap->addAction(act);
- act = new Action(kStandardActionMoveDown, _("Move backward"));
+ act = new Action(kStandardActionMoveDown, _("Move backwards"));
act->setKeyEvent(KEYCODE_DOWN);
act->addDefaultInputMapping("DOWN"); // original keyboard
act->addDefaultInputMapping("JOY_DOWN"); // extra joy
@@ -733,7 +733,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
act->addDefaultInputMapping("UP"); // original keyboard
gameKeyMap->addAction(act);
- act = new Action(kStandardActionMoveDown, _("Move backward"));
+ act = new Action(kStandardActionMoveDown, _("Move backwards"));
act->setKeyEvent(KEYCODE_DOWN);
act->addDefaultInputMapping("DOWN"); // original keyboard
gameKeyMap->addAction(act);
@@ -2235,7 +2235,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
extraKeyMap->addAction(act);
if (gameId != "rhiannon") {
- act = new Action(kStandardActionMoveDown, _("Move backward"));
+ act = new Action(kStandardActionMoveDown, _("Move backwards"));
act->setCustomEngineActionEvent(kClickAtBottom);
act->addDefaultInputMapping("DOWN"); // extra keyboard
act->addDefaultInputMapping("KP2"); // extra keyboard
Commit: efc7bf67d2652d2c95d19a29d7224e55e537a532
https://github.com/scummvm/scummvm/commit/efc7bf67d2652d2c95d19a29d7224e55e537a532
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-21T21:46:41+01:00
Commit Message:
I18N: "Move backward" -> "Move backwards" for keymapper actions
Changed paths:
engines/dm/metaengine.cpp
engines/titanic/metaengine.cpp
diff --git a/engines/dm/metaengine.cpp b/engines/dm/metaengine.cpp
index 38b6c6ff9df..af47d8b0060 100644
--- a/engines/dm/metaengine.cpp
+++ b/engines/dm/metaengine.cpp
@@ -223,7 +223,7 @@ Common::KeymapArray DMMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("JOY_LEFT");
gameKeyMap->addAction(act);
- act = new Action("MOVEBACKWARD", _("Move backward"));
+ act = new Action("MOVEBACKWARD", _("Move backwards"));
act->setCustomEngineActionEvent(kActionMoveBackward);
act->addDefaultInputMapping("KP2"); // Numeric pad 2 Atari ST: Code = 0x5000
act->addDefaultInputMapping("s"); // Added for convenience
diff --git a/engines/titanic/metaengine.cpp b/engines/titanic/metaengine.cpp
index 794f5902970..c9ff716bf92 100644
--- a/engines/titanic/metaengine.cpp
+++ b/engines/titanic/metaengine.cpp
@@ -340,7 +340,7 @@ Common::KeymapArray TitanicMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
starMapKeymap->addAction(act);
- act = new Action("BACKWARD", _("Move backward"));
+ act = new Action("BACKWARD", _("Move backwards"));
act->setCustomEngineActionEvent(kActionStarMapBackward);
act->allowKbdRepeats();
act->addDefaultInputMapping("PERIOD");
@@ -381,7 +381,7 @@ Common::KeymapArray TitanicMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("JOY_UP");
movementKeymap->addAction(act);
- act = new Action("MBACKWARD", _("Move backward"));
+ act = new Action("MBACKWARD", _("Move backwards"));
act->setCustomEngineActionEvent(kActionMovementBackwards);
act->addDefaultInputMapping("DOWN");
act->addDefaultInputMapping("JOY_DOWN");
More information about the Scummvm-git-logs
mailing list