[Scummvm-git-logs] scummvm master -> 77f45f8ca63d7d02631143b7fe1f2892ab3eb21f

[criezy]

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:
77f45f8ca6 GRIFFON: Add default mapping for game controllers


Commit: 77f45f8ca63d7d02631143b7fe1f2892ab3eb21f
    https://github.com/scummvm/scummvm/commit/77f45f8ca63d7d02631143b7fe1f2892ab3eb21f
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-09-10T17:56:55+01:00

Commit Message:
GRIFFON: Add default mapping for game controllers

Changed paths:
    engines/griffon/detection.cpp


diff --git a/engines/griffon/detection.cpp b/engines/griffon/detection.cpp
index f428cfe0ed..fbc21e6101 100644
--- a/engines/griffon/detection.cpp
+++ b/engines/griffon/detection.cpp
@@ -106,43 +106,51 @@ Common::KeymapArray GriffonMetaEngine::initKeymaps(const char *target) const {
 	act = new Action(kStandardActionSkip, _("Menu / Skip"));
 	act->setCustomEngineActionEvent(Griffon::kGriffonMenu);
 	act->addDefaultInputMapping("ESCAPE");
+	act->addDefaultInputMapping("JOY_Y");
 	engineKeyMap->addAction(act);
 
 	act = new Action("RETURN", _("Confirm"));
 	act->setCustomEngineActionEvent(Griffon::kGriffonConfirm);
 	act->addDefaultInputMapping("RETURN");
+	act->addDefaultInputMapping("JOY_X");
 	engineKeyMap->addAction(act);
 
 	act = new Action(kStandardActionMoveUp, _("Up"));
 	act->setCustomEngineActionEvent(Griffon::kGriffonUp);
 	act->addDefaultInputMapping("UP");
+	act->addDefaultInputMapping("JOY_UP");
 	engineKeyMap->addAction(act);
 
 	act = new Action(kStandardActionMoveDown, _("Down"));
 	act->setCustomEngineActionEvent(Griffon::kGriffonDown);
 	act->addDefaultInputMapping("DOWN");
+	act->addDefaultInputMapping("JOY_DOWN");
 	engineKeyMap->addAction(act);
 
 	act = new Action(kStandardActionMoveLeft, _("Left"));
 	act->setCustomEngineActionEvent(Griffon::kGriffonLeft);
 	act->addDefaultInputMapping("LEFT");
+	act->addDefaultInputMapping("JOY_LEFT");
 	engineKeyMap->addAction(act);
 
 	act = new Action(kStandardActionMoveRight, _("Right"));
 	act->setCustomEngineActionEvent(Griffon::kGriffonRight);
 	act->addDefaultInputMapping("RIGHT");
+	act->addDefaultInputMapping("JOY_RIGHT");
 	engineKeyMap->addAction(act);
 
 	act = new Action("ATTACK", _("Attack"));
 	act->setCustomEngineActionEvent(Griffon::kGriffonAttack);
 	act->addDefaultInputMapping("LCTRL");
 	act->addDefaultInputMapping("RCTRL");
+	act->addDefaultInputMapping("JOY_A");
 	engineKeyMap->addAction(act);
 
 	act = new Action("INVENTORY", _("Inventory"));
 	act->setCustomEngineActionEvent(Griffon::kGriffonInventory);
 	act->addDefaultInputMapping("LALT");
 	act->addDefaultInputMapping("RALT");
+	act->addDefaultInputMapping("JOY_B");
 	engineKeyMap->addAction(act);
 
 	act = new Action("SPEEDUP", _("Speed Up Cutscene"));