[Scummvm-git-logs] scummvm master -> e62aa1cb8a45ff180e7c9898b999d814e9cb8ed2
sev-
noreply at scummvm.org
Mon Nov 4 14:37: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:
e62aa1cb8a I18N: Normalized "Left Click" to be in title case in keymaps
Commit: e62aa1cb8a45ff180e7c9898b999d814e9cb8ed2
https://github.com/scummvm/scummvm/commit/e62aa1cb8a45ff180e7c9898b999d814e9cb8ed2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-11-04T15:36:23+01:00
Commit Message:
I18N: Normalized "Left Click" to be in title case in keymaps
Changed paths:
engines/agos/metaengine.cpp
engines/bbvs/metaengine.cpp
engines/cge/metaengine.cpp
engines/cge2/metaengine.cpp
engines/cine/metaengine.cpp
engines/composer/metaengine.cpp
engines/cruise/metaengine.cpp
engines/draci/metaengine.cpp
engines/groovie/metaengine.cpp
engines/hopkins/metaengine.cpp
engines/hugo/metaengine.cpp
engines/illusions/metaengine.cpp
engines/lure/metaengine.cpp
engines/made/metaengine.cpp
engines/mads/metaengine.cpp
engines/saga/metaengine.cpp
engines/stark/metaengine.cpp
engines/sword1/metaengine.cpp
engines/tinsel/metaengine.cpp
engines/toon/metaengine.cpp
engines/touche/metaengine.cpp
engines/trecision/metaengine.cpp
engines/tsage/metaengine.cpp
engines/tucker/metaengine.cpp
diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index 41b8103324c..be2d509013b 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -229,13 +229,13 @@ Common::KeymapArray AgosMetaEngine::initKeymaps(const char *target) const {
Keymap *yesNoKeymap = new Keymap(Keymap::kKeymapTypeGame, "game-Yes/No", _("Yes/No keymapping"));
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/bbvs/metaengine.cpp b/engines/bbvs/metaengine.cpp
index baf1b898d12..2cfca525165 100644
--- a/engines/bbvs/metaengine.cpp
+++ b/engines/bbvs/metaengine.cpp
@@ -95,13 +95,13 @@ Common::KeymapArray BbvsMetaEngine::initKeymaps(const char *target) const {
Common::Action *act;
- act = new Common::Action(kStandardActionLeftClick, _("Left click"));
+ act = new Common::Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Common::Action(kStandardActionRightClick, _("Right click"));
+ act = new Common::Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
@@ -112,32 +112,32 @@ Common::KeymapArray BbvsMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("JOY_X");
act->addDefaultInputMapping("ESCAPE");
escapeKeyMap->addAction(act);
-
+
act = new Common::Action("INVENTORY", _("Open inventory"));
act->setCustomEngineActionEvent(kActionInventory);
act->addDefaultInputMapping("i");
act->addDefaultInputMapping("SPACE");
act->addDefaultInputMapping("JOY_y");
gameKeyMap->addAction(act);
-
+
act = new Common::Action("LOOK", _("Look"));
act->setCustomEngineActionEvent(kActionLook);
act->addDefaultInputMapping("l");
act->addDefaultInputMapping("JOY_DOWN");
gameKeyMap->addAction(act);
-
+
act = new Common::Action("TALK", _("Talk"));
act->setCustomEngineActionEvent(kActionTalk);
act->addDefaultInputMapping("t");
act->addDefaultInputMapping("JOY_RIGHT");
gameKeyMap->addAction(act);
-
+
act = new Common::Action("USE", _("Use"));
act->setCustomEngineActionEvent(kActionUse);
act->addDefaultInputMapping("u");
act->addDefaultInputMapping("JOY_LEFT");
gameKeyMap->addAction(act);
-
+
act = new Common::Action("WALK", _("Walk"));
act->setCustomEngineActionEvent(kActionWalk);
act->addDefaultInputMapping("w");
diff --git a/engines/cge/metaengine.cpp b/engines/cge/metaengine.cpp
index f19d2bc8338..5042a9eb4e9 100644
--- a/engines/cge/metaengine.cpp
+++ b/engines/cge/metaengine.cpp
@@ -200,13 +200,13 @@ Common::KeymapArray CGEMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
keymap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/cge2/metaengine.cpp b/engines/cge2/metaengine.cpp
index 1bc9bd31221..91e85d4a938 100644
--- a/engines/cge2/metaengine.cpp
+++ b/engines/cge2/metaengine.cpp
@@ -213,13 +213,13 @@ Common::KeymapArray CGE2MetaEngine::initKeymaps(const char *target) const {
Common::Action *act;
- act = new Common::Action(kStandardActionLeftClick, _("Left click"));
+ act = new Common::Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
keymap->addAction(act);
- act = new Common::Action(kStandardActionRightClick, _("Right click"));
+ act = new Common::Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/cine/metaengine.cpp b/engines/cine/metaengine.cpp
index 1204d9ea799..17083cf72c3 100644
--- a/engines/cine/metaengine.cpp
+++ b/engines/cine/metaengine.cpp
@@ -96,7 +96,7 @@ public:
bool removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target = nullptr) const override;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
-
+
Common::KeymapArray initKeymaps(const char *target) const override;
};
@@ -262,13 +262,13 @@ Common::KeymapArray CineMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
@@ -423,7 +423,7 @@ Common::KeymapArray CineMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("DOWN");
gameKeyMap->addAction(act);
-
+
KeymapArray keymaps(4);
keymaps[0] = engineKeyMap;
keymaps[1] = mouseKeyMap;
diff --git a/engines/composer/metaengine.cpp b/engines/composer/metaengine.cpp
index 83bfe4182d8..36e9e378667 100644
--- a/engines/composer/metaengine.cpp
+++ b/engines/composer/metaengine.cpp
@@ -110,28 +110,28 @@ Common::KeymapArray ComposerMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
engineKeyMap->addAction(act);
-
+
act = new Action(kStandardActionSkip, _("Skip"));
act->setKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE));
act->addDefaultInputMapping("ESCAPE");
act->addDefaultInputMapping("JOY_Y");
act->allowKbdRepeats();
engineKeyMap->addAction(act);
-
+
return Keymap::arrayOf(engineKeyMap);
-}
-
+}
+
Common::String getSaveName(Common::InSaveFile *in) {
Common::Serializer ser(in, nullptr);
Common::String name;
diff --git a/engines/cruise/metaengine.cpp b/engines/cruise/metaengine.cpp
index da25ab2eb56..4ce3008abbd 100644
--- a/engines/cruise/metaengine.cpp
+++ b/engines/cruise/metaengine.cpp
@@ -143,14 +143,14 @@ Common::KeymapArray CruiseMetaEngine::initKeymaps(const char *target) const {
Keymap *gameKeyMap = new Keymap(Keymap::kKeymapTypeGame, "game-shortcuts", _("Game keymappings"));
Action *act;
-
- act = new Action(kStandardActionLeftClick, _("Left click"));
+
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/draci/metaengine.cpp b/engines/draci/metaengine.cpp
index 6d54f308fa3..6c5a266c597 100644
--- a/engines/draci/metaengine.cpp
+++ b/engines/draci/metaengine.cpp
@@ -140,13 +140,13 @@ Common::KeymapArray DraciMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
@@ -207,7 +207,7 @@ Common::KeymapArray DraciMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("JOY_UP");
gameKeyMap->addAction(act);
-
+
KeymapArray keymaps(2);
keymaps[0] = engineKeyMap;
keymaps[1] = gameKeyMap;
diff --git a/engines/groovie/metaengine.cpp b/engines/groovie/metaengine.cpp
index bd04a3ab7df..470bb07fa67 100644
--- a/engines/groovie/metaengine.cpp
+++ b/engines/groovie/metaengine.cpp
@@ -202,18 +202,18 @@ Common::KeymapArray GroovieMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
engineKeyMap->addAction(act);
-
+
act = new Action("SKIPORFAST", _("Skip or fast forward scene"));
act->setCustomEngineActionEvent(kActionSkip);
act->addDefaultInputMapping("ESCAPE");
diff --git a/engines/hopkins/metaengine.cpp b/engines/hopkins/metaengine.cpp
index f5d749e9369..972ebce1149 100644
--- a/engines/hopkins/metaengine.cpp
+++ b/engines/hopkins/metaengine.cpp
@@ -210,13 +210,13 @@ Common::KeymapArray HopkinsMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
@@ -255,7 +255,7 @@ Common::KeymapArray HopkinsMetaEngine::initKeymaps(const char *target) const {
gameKeyMap->addAction(act);
-
+
KeymapArray keymaps(2);
keymaps[0] = engineKeyMap;
keymaps[1] = gameKeyMap;
diff --git a/engines/hugo/metaengine.cpp b/engines/hugo/metaengine.cpp
index 01ed0c652e0..d1dbdb89385 100644
--- a/engines/hugo/metaengine.cpp
+++ b/engines/hugo/metaengine.cpp
@@ -94,20 +94,20 @@ Common::KeymapArray HugoMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
act->addDefaultInputMapping("KP_PLUS");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
act->addDefaultInputMapping("KP_MINUS");
engineKeyMap->addAction(act);
-
+
act = new Action("USERHELP", _("User help"));
act->setCustomEngineActionEvent(kActionUserHelp);
act->addDefaultInputMapping("F1");
@@ -218,7 +218,7 @@ Common::KeymapArray HugoMetaEngine::initKeymaps(const char *target) const {
act->setCustomEngineActionEvent(kActionMoveBottomRight);
act->addDefaultInputMapping("KP3");
gameKeyMap->addAction(act);
-
+
KeymapArray keymaps(2);
keymaps[0] = engineKeyMap;
keymaps[1] = gameKeyMap;
diff --git a/engines/illusions/metaengine.cpp b/engines/illusions/metaengine.cpp
index 7afabb88a6d..4f67a7d990e 100644
--- a/engines/illusions/metaengine.cpp
+++ b/engines/illusions/metaengine.cpp
@@ -91,14 +91,14 @@ Common::KeymapArray IllusionsMetaEngine::initKeymaps(const char *target) const {
Common::Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
act->addDefaultInputMapping("RETURN");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/lure/metaengine.cpp b/engines/lure/metaengine.cpp
index 1aab2735956..54724f3b342 100644
--- a/engines/lure/metaengine.cpp
+++ b/engines/lure/metaengine.cpp
@@ -174,13 +174,13 @@ Common::KeymapArray LureMetaEngine::initKeymaps(const char *target) const {
Common::Action *act;
{
- act = new Common::Action(kStandardActionLeftClick, _("Left click"));
+ act = new Common::Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Common::Action(kStandardActionRightClick, _("Right click"));
+ act = new Common::Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
@@ -221,7 +221,7 @@ Common::KeymapArray LureMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("JOY_LEFT");
fightKeyMap->addAction(act);
-
+
// I18N: Move actor right during fight
act = new Common::Action("MOVERIGHT", _("Move right"));
act->setCustomEngineActionEvent(kActionFightMoveRight);
diff --git a/engines/made/metaengine.cpp b/engines/made/metaengine.cpp
index 942d4eaa99c..d1ba17e7cda 100644
--- a/engines/made/metaengine.cpp
+++ b/engines/made/metaengine.cpp
@@ -104,14 +104,14 @@ Common::KeymapArray MadeMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
act->addDefaultInputMapping("KP_PLUS");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
@@ -156,19 +156,19 @@ Common::KeymapArray MadeMetaEngine::initKeymaps(const char *target) const {
act = new Action("MENU", _("Menu"));
act->setCustomEngineActionEvent(kActionMenu);
act->addDefaultInputMapping("F1");
- act->addDefaultInputMapping("JOY_GUIDE");
+ act->addDefaultInputMapping("JOY_GUIDE");
gameKeyMap->addAction(act);
act = new Action("SAVEGAME", _("Save game"));
act->setCustomEngineActionEvent(kActionSaveGame);
act->addDefaultInputMapping("F2");
- act->addDefaultInputMapping("JOY_LEFT_SHOULDER");
+ act->addDefaultInputMapping("JOY_LEFT_SHOULDER");
gameKeyMap->addAction(act);
act = new Action("LOADGAME", _("Load game"));
act->setCustomEngineActionEvent(kActionLoadGame);
act->addDefaultInputMapping("F3");
- act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
+ act->addDefaultInputMapping("JOY_RIGHT_SHOULDER");
gameKeyMap->addAction(act);
act = new Action("RPTMSG", _("Repeat last message"));
diff --git a/engines/mads/metaengine.cpp b/engines/mads/metaengine.cpp
index 90d5cb9f7fd..e38086054f7 100644
--- a/engines/mads/metaengine.cpp
+++ b/engines/mads/metaengine.cpp
@@ -277,13 +277,13 @@ Common::KeymapArray MADSMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/saga/metaengine.cpp b/engines/saga/metaengine.cpp
index 54700fccd69..e7a34b457e8 100644
--- a/engines/saga/metaengine.cpp
+++ b/engines/saga/metaengine.cpp
@@ -275,18 +275,18 @@ Common::KeymapArray SagaMetaEngine::initKeymaps(const char *target) const {
Action *act;
{
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionMiddleClick, _("Middle click"));
+ act = new Action(kStandardActionMiddleClick, _("Middle Click"));
act->addDefaultInputMapping("MOUSE_MIDDLE");
act->setMiddleClickEvent();
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/stark/metaengine.cpp b/engines/stark/metaengine.cpp
index 805f1711e4e..058a33ad303 100644
--- a/engines/stark/metaengine.cpp
+++ b/engines/stark/metaengine.cpp
@@ -185,14 +185,14 @@ Common::KeymapArray StarkMetaEngine::initKeymaps(const char *target) const {
Keymap *gameKeyMap = new Keymap(Keymap::kKeymapTypeGame, "game-shortcuts", _("Game keymappings"));
Action *act;
-
- act = new Action(kStandardActionLeftClick, _("Left click"));
+
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
@@ -204,12 +204,12 @@ Common::KeymapArray StarkMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("F1");
act->addDefaultInputMapping("JOY_X");
gameKeyMap->addAction(act);
-
+
act = new Action("SAVEGAME", _("Save game"));
act->setCustomEngineActionEvent(kActionSaveGame);
act->addDefaultInputMapping("F2");
gameKeyMap->addAction(act);
-
+
act = new Action("LOADGAME", _("Load game"));
act->setCustomEngineActionEvent(kActionLoadGame);
act->addDefaultInputMapping("F3");
@@ -226,44 +226,44 @@ Common::KeymapArray StarkMetaEngine::initKeymaps(const char *target) const {
act->setCustomEngineActionEvent(kActionAprilsDiary);
act->addDefaultInputMapping("F5");
gameKeyMap->addAction(act);
-
+
act = new Action("VIDREPLAY", _("Video replay"));
act->setCustomEngineActionEvent(kActionVideoReplay);
act->addDefaultInputMapping("F6");
gameKeyMap->addAction(act);
-
+
act = new Action("GAMESETTINGS", _("Game settings"));
act->setCustomEngineActionEvent(kActionGameSettings);
act->addDefaultInputMapping("F7");
gameKeyMap->addAction(act);
-
+
act = new Action("SAVESCRNSHOT", _("Save screenshot"));
act->setCustomEngineActionEvent(kActionSaveScreenshot);
act->addDefaultInputMapping("F8");
gameKeyMap->addAction(act);
-
+
act = new Action("TOGGLESUBS", _("Toggle subtitles"));
act->setCustomEngineActionEvent(kActionToggleSubtitles);
act->addDefaultInputMapping("F9");
gameKeyMap->addAction(act);
-
+
act = new Action("QUITTOMENU", _("Quit to menu"));
act->setCustomEngineActionEvent(kActionQuitToMenu);
act->addDefaultInputMapping("F10");
gameKeyMap->addAction(act);
-
+
act = new Action("CYCLEBACK", _("Cycle back through inventory cursor items"));
act->setCustomEngineActionEvent(kActionCycleForwardInventory);
act->addDefaultInputMapping("a");
act->addDefaultInputMapping("JOY_LEFT_TRIGGER");
gameKeyMap->addAction(act);
-
+
act = new Action("CYCLEFORWARD", _("Cycle forward through inventory cursor items"));
act->setCustomEngineActionEvent(kActionCycleBackInventory);
act->addDefaultInputMapping("s");
act->addDefaultInputMapping("JOY_RIGHT_TRIGGER");
gameKeyMap->addAction(act);
-
+
act = new Action("INVENTORY", _("Inventory"));
act->setCustomEngineActionEvent(kActionInventory);
act->addDefaultInputMapping("i");
@@ -331,14 +331,14 @@ Common::KeymapArray StarkMetaEngine::initKeymaps(const char *target) const {
act->addDefaultInputMapping("KP_ENTER");
act->addDefaultInputMapping("JOY_RIGHT");
gameKeyMap->addAction(act);
-
+
act = new Action("SKIP", _("Skip video sequence or dialogue"));
act->setCustomEngineActionEvent(kActionSkip);
act->addDefaultInputMapping("ESCAPE");
act->addDefaultInputMapping("JOY_BACK");
gameKeyMap->addAction(act);
-
+
KeymapArray keymaps(2);
keymaps[0] = engineKeyMap;
keymaps[1] = gameKeyMap;
diff --git a/engines/sword1/metaengine.cpp b/engines/sword1/metaengine.cpp
index a8123f61a41..e32825724b5 100644
--- a/engines/sword1/metaengine.cpp
+++ b/engines/sword1/metaengine.cpp
@@ -43,7 +43,7 @@
#include "gui/widgets/popup.h"
namespace Sword1 {
-
+
#define GAMEOPTION_WINDOWS_AUDIO_MODE GUIO_GAMEOPTIONS1
#define GAMEOPTION_MULTILANGUAGE GUIO_GAMEOPTIONS2
#define GAMEOPTION_MULTILANGUAGE_EXTENDED GUIO_GAMEOPTIONS3
@@ -268,13 +268,13 @@ Common::KeymapArray SwordMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/tinsel/metaengine.cpp b/engines/tinsel/metaengine.cpp
index 21251a77ea9..2ea792a3bd4 100644
--- a/engines/tinsel/metaengine.cpp
+++ b/engines/tinsel/metaengine.cpp
@@ -98,7 +98,7 @@ public:
bool removeSaveState(const char *target, int slot) const override;
// TODO: Add getSavegameFile(). See comments in loadGameState and removeSaveState
-
+
void registerDefaultSettings(const Common::String &target) const override;
const ADExtraGuiOptionsMap *getAdvancedExtraGuiOptions() const override;
@@ -243,13 +243,13 @@ Common::KeymapArray TinselMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/toon/metaengine.cpp b/engines/toon/metaengine.cpp
index 9b24ee38b2c..fd9bd43feb1 100644
--- a/engines/toon/metaengine.cpp
+++ b/engines/toon/metaengine.cpp
@@ -83,13 +83,13 @@ Common::KeymapArray ToonMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/touche/metaengine.cpp b/engines/touche/metaengine.cpp
index ab602499c5f..b7b48e3f6b0 100644
--- a/engines/touche/metaengine.cpp
+++ b/engines/touche/metaengine.cpp
@@ -119,13 +119,13 @@ Common::KeymapArray ToucheMetaEngine::initKeymaps(const char *target) const {
Keymap *gameKeyMap = new Keymap(Keymap::kKeymapTypeGame, "game-shortcuts", _("Game keymappings"));
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/trecision/metaengine.cpp b/engines/trecision/metaengine.cpp
index 69d2f105f95..776f4878769 100644
--- a/engines/trecision/metaengine.cpp
+++ b/engines/trecision/metaengine.cpp
@@ -122,13 +122,13 @@ Common::KeymapArray TrecisionMetaEngine::initKeymaps(const char *target) const {
Action *act;
- act = new Action(kStandardActionLeftClick, _("Left click"));
+ act = new Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Action(kStandardActionRightClick, _("Right click"));
+ act = new Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
diff --git a/engines/tsage/metaengine.cpp b/engines/tsage/metaengine.cpp
index 3108bb86b3a..e98ec293b9b 100644
--- a/engines/tsage/metaengine.cpp
+++ b/engines/tsage/metaengine.cpp
@@ -175,13 +175,13 @@ Common::KeymapArray TSageMetaEngine::initKeymaps(const char *target) const {
Common::String extra = ConfMan.get("extra", target);
const bool isDemo = extra.contains("Demo");
- act = new Common::Action(kStandardActionLeftClick, _("Left click"));
+ act = new Common::Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Common::Action(kStandardActionRightClick, _("Right click"));
+ act = new Common::Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
@@ -291,17 +291,17 @@ Common::KeymapArray TSageMetaEngine::initKeymaps(const char *target) const {
act = new Common::Action("INCREASESPEED", _("Increase speed"));
act->setCustomEngineActionEvent(kActionIncreaseSpeed);
- act->addDefaultInputMapping("KP9");
+ act->addDefaultInputMapping("KP9");
gameKeyMap->addAction(act);
act = new Common::Action("DECREASESPEED", _("Decrease speed"));
act->setCustomEngineActionEvent(kActionDecreaseSpeed);
- act->addDefaultInputMapping("KP3");
+ act->addDefaultInputMapping("KP3");
gameKeyMap->addAction(act);
act = new Common::Action("MINIMUMSPEED", _("Minimum speed"));
act->setCustomEngineActionEvent(kActionMinimumSpeed);
- act->addDefaultInputMapping("KP1");
+ act->addDefaultInputMapping("KP1");
gameKeyMap->addAction(act);
act = new Common::Action("MAXIMUMSPEED", _("Maximum speed"));
@@ -316,12 +316,12 @@ Common::KeymapArray TSageMetaEngine::initKeymaps(const char *target) const {
act = new Common::Action("MEDIUMSPEED", _("Medium speed"));
act->setCustomEngineActionEvent(kActionMediumSpeed);
- act->addDefaultInputMapping("KP0");
+ act->addDefaultInputMapping("KP0");
gameKeyMap->addAction(act);
act = new Common::Action("DRAWCARDS", _("Draw Cards"));
act->setCustomEngineActionEvent(kActionDrawCards);
- act->addDefaultInputMapping("SPACE");
+ act->addDefaultInputMapping("SPACE");
gameKeyMap->addAction(act);
}
@@ -337,4 +337,3 @@ Common::KeymapArray TSageMetaEngine::initKeymaps(const char *target) const {
#else
REGISTER_PLUGIN_STATIC(TSAGE, PLUGIN_TYPE_ENGINE, TSageMetaEngine);
#endif
-
diff --git a/engines/tucker/metaengine.cpp b/engines/tucker/metaengine.cpp
index 3c013b440e7..1e1b953bcbb 100644
--- a/engines/tucker/metaengine.cpp
+++ b/engines/tucker/metaengine.cpp
@@ -156,7 +156,7 @@ public:
target = getName();
return Tucker::generateGameStateFileName(target, saveGameIdx, saveGameIdx == kSavegameFilePattern);
}
-
+
Common::KeymapArray initKeymaps(const char *target) const override;
};
@@ -169,13 +169,13 @@ Common::KeymapArray TuckerMetaEngine::initKeymaps(const char *target) const {
Common::Action *act;
- act = new Common::Action(kStandardActionLeftClick, _("Left click"));
+ act = new Common::Action(kStandardActionLeftClick, _("Left Click"));
act->setLeftClickEvent();
act->addDefaultInputMapping("MOUSE_LEFT");
act->addDefaultInputMapping("JOY_A");
engineKeyMap->addAction(act);
- act = new Common::Action(kStandardActionRightClick, _("Right click"));
+ act = new Common::Action(kStandardActionRightClick, _("Right Click"));
act->setRightClickEvent();
act->addDefaultInputMapping("MOUSE_RIGHT");
act->addDefaultInputMapping("JOY_B");
More information about the Scummvm-git-logs
mailing list