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

[bluegr]

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:
fa2febbe07 WINTERMUTE: Disable conflicting keymap in Alpha Polaris


Commit: fa2febbe075c92cc31ed198d29d158c73eddd08d
    https://github.com/scummvm/scummvm/commit/fa2febbe075c92cc31ed198d29d158c73eddd08d
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-06-14T15:02:53+03:00

Commit Message:
WINTERMUTE: Disable conflicting keymap in Alpha Polaris

Changed paths:
    engines/wintermute/keymapper_tables.h


diff --git a/engines/wintermute/keymapper_tables.h b/engines/wintermute/keymapper_tables.h
index 7a87dd154b..f7ecc828ed 100644
--- a/engines/wintermute/keymapper_tables.h
+++ b/engines/wintermute/keymapper_tables.h
@@ -483,7 +483,7 @@ inline Common::KeymapArray getWintermuteKeymaps(const char *target, const Common
 
 		act = new Action("SCRS", _("Save screenshot"));
 		act->setKeyEvent(KeyState(KEYCODE_F5, 0, KBD_CTRL));
-		act->addDefaultInputMapping("C+F5"); // original keyboard
+		// act->addDefaultInputMapping("C+F5"); // original keyboard (disabled due to conflict with GMM)
 		gameKeyMap->addAction(act);
 
 		act = new Action("VOLMAX", _("Volume max"));