[Scummvm-git-logs] scummvm master -> f35a538d4f6f2477c35616cefd3715be6b76f250
sev-
noreply at scummvm.org
Thu Oct 10 12:44:04 UTC 2024
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:
f35a538d4f I18N: Unified "Move Backwards" keymapper key caption
Commit: f35a538d4f6f2477c35616cefd3715be6b76f250
https://github.com/scummvm/scummvm/commit/f35a538d4f6f2477c35616cefd3715be6b76f250
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-10T14:43:55+02:00
Commit Message:
I18N: Unified "Move Backwards" keymapper key caption
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 68e124fa43d..797bcf5200a 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, _("Interact via Left Click"), &Common::Action::setLeftClickEvent, "MOUSE_LEFT", "JOY_A");
addKeymapAction(keyMap, Common::kStandardActionRightClick, _("Interact via 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 Back"), 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");
diff --git a/engines/kyra/engine/lol.cpp b/engines/kyra/engine/lol.cpp
index a645aa591ee..c3e2591796e 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 Back"), 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");
@@ -704,7 +704,7 @@ uint8 *LoLEngine::getItemIconShapePtr(int index) {
int LoLEngine::mainMenu() {
bool hasSave = false;
for (int i = 0; i < 20 && !hasSave; ++i) {
- if (saveFileLoadable(i))
+ if (saveFileLoadable(i))
hasSave = true;
}
@@ -1049,7 +1049,7 @@ void LoLEngine::update() {
"Lora a quitte le groupe. Ses objets sont par terre.",
"Lora hat die Gruppe verlassen. Ihre Sachen sind auf dem Boden.",
"Lora has left the party. Her items are on the floor.", // TODO: Translate to Japanese
- "Lora ha abandonado el grupo. Sus articulos estan en el suelo.",
+ "Lora ha abandonado el grupo. Sus articulos estan en el suelo.",
"Lora has left the party. Her items are on the floor." // TODO: Translate to Traditional Chinese
};
@@ -1199,7 +1199,7 @@ bool LoLEngine::addCharacter(int id) {
} else {
return false;
}
- }
+ }
int i = 0;
for (; i < _charDefaultsSize; i++) {
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 481d5831725..07b39c87738 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -878,7 +878,7 @@ Common::KeymapArray MohawkEngine_Riven::initKeymaps(const char *target) {
act->addDefaultInputMapping("SPACE");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionMoveUp, _("Move forward"));
+ act = new Action(kStandardActionMoveUp, _("Move Forward"));
act->setCustomEngineActionEvent(kRivenActionMoveForward);
act->addDefaultInputMapping("UP");
act->addDefaultInputMapping("JOY_UP");
@@ -892,7 +892,7 @@ Common::KeymapArray MohawkEngine_Riven::initKeymaps(const char *target) {
act->setCustomEngineActionEvent(kRivenActionMoveForwardRight);
engineKeyMap->addAction(act);
- act = new Action(kStandardActionMoveDown, _("Move backwards"));
+ 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 71815f50807..75ef796647e 100644
--- a/engines/twine/metaengine.cpp
+++ b/engines/twine/metaengine.cpp
@@ -338,7 +338,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 77a6b353ee0..2c13a3af534 100644
--- a/engines/wintermute/keymapper_tables.h
+++ b/engines/wintermute/keymapper_tables.h
@@ -146,13 +146,13 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
gameId == "lovmamuta" ||
gameId == "wmedemo3d"
) {
- act = new Action(kStandardActionMoveUp, _("Walk forward"));
+ act = new Action(kStandardActionMoveUp, _("Move Forward"));
act->setKeyEvent(KEYCODE_UP);
act->addDefaultInputMapping("UP"); // original keyboard
act->addDefaultInputMapping("JOY_UP"); // extra joy
gameKeyMap->addAction(act);
- act = new Action(kStandardActionMoveDown, _("Walk backward"));
+ act = new Action(kStandardActionMoveDown, _("Move Backwards"));
act->setKeyEvent(KEYCODE_DOWN);
act->addDefaultInputMapping("DOWN"); // original keyboard
act->addDefaultInputMapping("JOY_DOWN"); // extra joy
@@ -356,7 +356,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
gameKeyMap->addAction(act);
// I18N: Some items are scripted to have alternative "Use" action, when MiddleClick is used
- // It may result in actor saying different text or item being decomposed to it's parts
+ // It may result in actor saying different text or item being decomposed to it's parts
act = new Action("ALTUSE", _("Alternative action"));
act->setMiddleClickEvent();
act->addDefaultInputMapping("MOUSE_MIDDLE"); // original mouse
@@ -383,7 +383,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
act->addDefaultInputMapping("HOME"); // original keyboard
//TODO: extra joy control, e.g. "JOY_R+JOY_B"
gameKeyMap->addAction(act);
- } else if (gameId == "darksummer" ||
+ } else if (gameId == "darksummer" ||
gameId == "tehran2016"
) {
act = new Action("HINT", _("Show hints"));
@@ -728,12 +728,12 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
act->addDefaultInputMapping("C+F11"); // original keyboard
gameKeyMap->addAction(act);
- act = new Action(kStandardActionMoveUp, _("Walk forward"));
+ act = new Action(kStandardActionMoveUp, _("Move Forward"));
act->setKeyEvent(KEYCODE_UP);
act->addDefaultInputMapping("UP"); // original keyboard
gameKeyMap->addAction(act);
- act = new Action(kStandardActionMoveDown, _("Walk backward"));
+ act = new Action(kStandardActionMoveDown, _("Move Backwards"));
act->setKeyEvent(KEYCODE_DOWN);
act->addDefaultInputMapping("DOWN"); // original keyboard
gameKeyMap->addAction(act);
@@ -2113,7 +2113,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
act->addDefaultInputMapping("JOY_DOWN"); // extra joy
gameKeyMap->addAction(act);
- act = new Action(kStandardActionMoveUp, _("Walk forward"));
+ act = new Action(kStandardActionMoveUp, _("Move Forward"));
act->setKeyEvent(KEYCODE_UP);
act->addDefaultInputMapping("UP"); // original keyboard
act->addDefaultInputMapping("JOY_UP"); // extra joy
@@ -2213,7 +2213,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
gameId == "rebeccacarlson1" ||
gameId == "rhiannon"
) {
- act = new Action(kStandardActionMoveUp, _("Walk forward"));
+ act = new Action(kStandardActionMoveUp, _("Move Forward"));
act->setCustomEngineActionEvent(kClickAtEntityNearestToCenter);
act->addDefaultInputMapping("UP"); // extra keyboard
act->addDefaultInputMapping("KP5"); // extra keyboard
@@ -2235,7 +2235,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
extraKeyMap->addAction(act);
if (gameId != "rhiannon") {
- act = new Action(kStandardActionMoveDown, _("Walk backward"));
+ act = new Action(kStandardActionMoveDown, _("Move Backwards"));
act->setCustomEngineActionEvent(kClickAtBottom);
act->addDefaultInputMapping("DOWN"); // extra keyboard
act->addDefaultInputMapping("KP2"); // extra keyboard
More information about the Scummvm-git-logs
mailing list