[Scummvm-git-logs] scummvm master -> 98580d8025d5453236913153c9a57b185cf110b0

[lolbot-iichan]

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:
98580d8025 WINTERMUTE: Allow keyboard walk at Rhiannon


Commit: 98580d8025d5453236913153c9a57b185cf110b0
    https://github.com/scummvm/scummvm/commit/98580d8025d5453236913153c9a57b185cf110b0
Author: lb_ii (lolbot_iichan at mail.ru)
Date: 2021-06-30T02:01:20+03:00

Commit Message:
WINTERMUTE: Allow keyboard walk at Rhiannon

Changed paths:
    engines/wintermute/keymapper_tables.h


diff --git a/engines/wintermute/keymapper_tables.h b/engines/wintermute/keymapper_tables.h
index 59f2c0ab86..0c3da9ce22 100644
--- a/engines/wintermute/keymapper_tables.h
+++ b/engines/wintermute/keymapper_tables.h
@@ -2134,7 +2134,8 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
 		gameId == "carolreed15" ||
 		gameId == "carolreed16" ||
 		gameId == "corrosion" ||
-		gameId == "rebeccacarlson1"
+		gameId == "rebeccacarlson1" ||
+		gameId == "rhiannon"
 	) {
 		act = new Action(kStandardActionMoveUp, _("Walk forward"));
 		act->setCustomEngineActionEvent(kClickAtEntityNearestToCenter);
@@ -2143,13 +2144,6 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
 		act->addDefaultInputMapping("JOY_UP"); // extra joy
 		extraKeyMap->addAction(act);
 
-		act = new Action(kStandardActionMoveDown, _("Walk backward"));
-		act->setCustomEngineActionEvent(kClickAtBottom);
-		act->addDefaultInputMapping("DOWN"); // extra keyboard
-		act->addDefaultInputMapping("KP2"); // extra keyboard
-		act->addDefaultInputMapping("JOY_DOWN"); // extra joy
-		extraKeyMap->addAction(act);
-
 		act = new Action(kStandardActionMoveLeft, _("Turn left"));
 		act->setCustomEngineActionEvent(kClickAtLeft);
 		act->addDefaultInputMapping("LEFT"); // extra keyboard
@@ -2163,6 +2157,15 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
 		act->addDefaultInputMapping("KP6"); // extra keyboard
 		act->addDefaultInputMapping("JOY_RIGHT"); // extra joy
 		extraKeyMap->addAction(act);
+
+		if (gameId != "rhiannon") {
+			act = new Action(kStandardActionMoveDown, _("Walk backward"));
+			act->setCustomEngineActionEvent(kClickAtBottom);
+			act->addDefaultInputMapping("DOWN"); // extra keyboard
+			act->addDefaultInputMapping("KP2"); // extra keyboard
+			act->addDefaultInputMapping("JOY_DOWN"); // extra joy
+			extraKeyMap->addAction(act);
+		}
 	}
 	result.push_back(extraKeyMap);