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

[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:
ccc9f6634d GRIM: Remove 'Quit' key mapping to avoid conflict with virtual keyboard


Commit: ccc9f6634d5fd2dd175a27b47a2b94b99f646ab5
    https://github.com/scummvm/scummvm/commit/ccc9f6634d5fd2dd175a27b47a2b94b99f646ab5
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-24T14:11:56+02:00

Commit Message:
GRIM: Remove 'Quit' key mapping to avoid conflict with virtual keyboard

Changed paths:
    engines/grim/grim.cpp


diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index 9c5540c13a..840e31a456 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -516,11 +516,6 @@ Common::KeymapArray GrimEngine::initKeymapsGrim(const char *target) {
 	act->addDefaultInputMapping("JOY_GUIDE");
 	engineKeyMap->addAction(act);
 
-	act = new Action("QUIT", _("Quit"));
-	act->setKeyEvent(KeyState(KEYCODE_q, 'q'));
-	act->addDefaultInputMapping("JOY_BACK");
-	engineKeyMap->addAction(act);
-
 	return Keymap::arrayOf(engineKeyMap);
 }
 
@@ -613,11 +608,6 @@ Common::KeymapArray GrimEngine::initKeymapsEMI(const char *target) {
 	act->addDefaultInputMapping("JOY_GUIDE");
 	engineKeyMap->addAction(act);
 
-	act = new Action("QUIT", _("Quit"));
-	act->setKeyEvent(KeyState(KEYCODE_q, 'q'));
-	act->addDefaultInputMapping("JOY_BACK");
-	engineKeyMap->addAction(act);
-
 	return Keymap::arrayOf(engineKeyMap);
 }