[Scummvm-git-logs] scummvm master -> 422cf51481f89afbbefb7df6a72893a49e9ad6f2

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0ecb90dc0a JANITORIAL: Remove trailing spaces
422cf51481 AGOS: Fix key description in the keymapper to match other engines


Commit: 0ecb90dc0adf825c5126987a65092fe6b6c66eb4
    https://github.com/scummvm/scummvm/commit/0ecb90dc0adf825c5126987a65092fe6b6c66eb4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-10T14:35:06+02:00

Commit Message:
JANITORIAL: Remove trailing spaces

Changed paths:
    engines/agos/metaengine.cpp


diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index fdb52f7ce56..d311356c0bb 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -289,26 +289,26 @@ Common::KeymapArray AgosMetaEngine::initKeymaps(const char *target) const {
 			gameId == "dimp") {
 		act = new Action("WLKFORWARD", _("Walk forward")); // KEYCODE_UP
 		act->setCustomEngineActionEvent(kActionWalkForward);
-		act->addDefaultInputMapping("UP"); 
-		act->addDefaultInputMapping("JOY_UP"); 
+		act->addDefaultInputMapping("UP");
+		act->addDefaultInputMapping("JOY_UP");
 		gameKeyMap->addAction(act);
 
 		act = new Action("TRNBACK", _("Turn backward")); // KEYCODE_DOWN
 		act->setCustomEngineActionEvent(kActionTurnBack);
-		act->addDefaultInputMapping("DOWN"); 
-		act->addDefaultInputMapping("JOY_DOWN"); 
+		act->addDefaultInputMapping("DOWN");
+		act->addDefaultInputMapping("JOY_DOWN");
 		gameKeyMap->addAction(act);
 
 		act = new Action("TRNLEFT", _("Turn left")); // KEYCODE_LEFT
 		act->setCustomEngineActionEvent(kActionTurnLeft);
-		act->addDefaultInputMapping("LEFT"); 
-		act->addDefaultInputMapping("JOY_LEFT"); 
+		act->addDefaultInputMapping("LEFT");
+		act->addDefaultInputMapping("JOY_LEFT");
 		gameKeyMap->addAction(act);
 
 		act = new Action("TRNRIGHT", _("Turn right")); // KEYCODE_RIGHT
 		act->setCustomEngineActionEvent(kActionTurnRight);
-		act->addDefaultInputMapping("RIGHT"); 
-		act->addDefaultInputMapping("JOY_RIGHT"); 
+		act->addDefaultInputMapping("RIGHT");
+		act->addDefaultInputMapping("JOY_RIGHT");
 		gameKeyMap->addAction(act);
 	}
 
@@ -331,7 +331,7 @@ Common::KeymapArray AgosMetaEngine::initKeymaps(const char *target) const {
 		act = new Action("SHOWOBJINTERACT", _("Show objects to interact"));
 		act->setCustomEngineActionEvent(kActionShowObjects);
 		act->addDefaultInputMapping("F10");
-		act->addDefaultInputMapping("JOY_UP"); 
+		act->addDefaultInputMapping("JOY_UP");
 		gameKeyMap->addAction(act);
 
 		if (gameId == "simon2") {
@@ -360,13 +360,13 @@ Common::KeymapArray AgosMetaEngine::initKeymaps(const char *target) const {
 		act = new Action("TOGGLESUB", _("Switches between speech only and combined speech and subtitles"));
 		act->setCustomEngineActionEvent(kActionToggleSubtitle);
 		act->addDefaultInputMapping("t");
-		act->addDefaultInputMapping("JOY_LEFT"); 
+		act->addDefaultInputMapping("JOY_LEFT");
 		gameKeyMap->addAction(act);
 
 		act = new Action("TOGGLESPEECH", _("Switches between subtitles only and combined speech and subtitles"));
 		act->setCustomEngineActionEvent(kActionToggleSpeech);
 		act->addDefaultInputMapping("v");
-		act->addDefaultInputMapping("JOY_RIGHT"); 
+		act->addDefaultInputMapping("JOY_RIGHT");
 		gameKeyMap->addAction(act);
 	}
 


Commit: 422cf51481f89afbbefb7df6a72893a49e9ad6f2
    https://github.com/scummvm/scummvm/commit/422cf51481f89afbbefb7df6a72893a49e9ad6f2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-10T14:35:06+02:00

Commit Message:
AGOS: Fix key description in the keymapper to match other engines

Changed paths:
    engines/agos/metaengine.cpp


diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index d311356c0bb..41b8103324c 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -270,7 +270,7 @@ Common::KeymapArray AgosMetaEngine::initKeymaps(const char *target) const {
 	act->addDefaultInputMapping("m");
 	gameKeyMap->addAction(act);
 
-	act = new Action("SNDEFFECT", _("Toggle sound effect on/off"));
+	act = new Action("SNDEFFECT", _("Toggle sound effects on/off"));
 	act->setCustomEngineActionEvent(kActionToggleSoundEffects);
 	act->addDefaultInputMapping("s");
 	gameKeyMap->addAction(act);