[Scummvm-git-logs] scummvm master -> be1d4f65d83e9b4ac4a22a407e5a9ebdbc15f246

[aquadran]

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:
be1d4f65d8 GRIM: Fix mapping of joystick action buttons in EMI (#2540)


Commit: be1d4f65d83e9b4ac4a22a407e5a9ebdbc15f246
    https://github.com/scummvm/scummvm/commit/be1d4f65d83e9b4ac4a22a407e5a9ebdbc15f246
Author: LMerckx (laurent-merckx at skynet.be)
Date: 2020-10-17T20:39:27+02:00

Commit Message:
GRIM: Fix mapping of joystick action buttons in EMI (#2540)

Changed paths:
    engines/grim/grim.cpp


diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index 8f4befdc7e..7be37ba45c 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -567,22 +567,22 @@ Common::KeymapArray GrimEngine::initKeymapsEMI(const char *target) {
 	engineKeyMap->addAction(act);
 
 	act = new Action("EXAM", _("Examine/Look"));
-	act->setKeyEvent(KeyState(KEYCODE_s, 'e'));
+	act->setKeyEvent(KeyState(KEYCODE_l, 'e'));
 	act->addDefaultInputMapping("JOY_X");
 	engineKeyMap->addAction(act);
 
 	act = new Action("BUSE", _("Use/Talk"));
-	act->setKeyEvent(KeyState(KEYCODE_w, 'u'));
+	act->setKeyEvent(KeyState(KEYCODE_u, 'u'));
 	act->addDefaultInputMapping("JOY_A");
 	engineKeyMap->addAction(act);
 
 	act = new Action("PICK", _("Pick up/Put away"));
-	act->setKeyEvent(KeyState(KEYCODE_a, 'p'));
+	act->setKeyEvent(KeyState(KEYCODE_KP_PLUS, 'p'));
 	act->addDefaultInputMapping("JOY_B");
 	engineKeyMap->addAction(act);
 
 	act = new Action("INVT", _("Inventory"));
-	act->setKeyEvent(KeyState(KEYCODE_d, 'i'));
+	act->setKeyEvent(KeyState(KEYCODE_INSERT, 'i'));
 	act->addDefaultInputMapping("JOY_Y");
 	engineKeyMap->addAction(act);