[Scummvm-git-logs] scummvm master -> 6218028f0278208692a08739707f1c95102dea76

[bgK]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
fbc938f438 KEYMAPPER: Fix remapping keys with multiple modifiers pressed
6218028f02 3DS: Add a note in the readme about using an older version of freetype2


Commit: fbc938f43827cfdccc1a8ab2ca79aea0f69c4d86
    https://github.com/scummvm/scummvm/commit/fbc938f43827cfdccc1a8ab2ca79aea0f69c4d86
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-13T07:57:02+01:00

Commit Message:
KEYMAPPER: Fix remapping keys with multiple modifiers pressed

Changed paths:
    backends/keymapper/hardware-input.cpp


diff --git a/backends/keymapper/hardware-input.cpp b/backends/keymapper/hardware-input.cpp
index da0cb78..b3ab98d 100644
--- a/backends/keymapper/hardware-input.cpp
+++ b/backends/keymapper/hardware-input.cpp
@@ -330,7 +330,7 @@ HardwareInput KeyboardHardwareInputSet::findHardwareInput(const Event &event) co
 		byte modifierFlags = 0;
 
 		for (const ModifierTableEntry *modifier = _modifiers;  modifier->id; modifier++) {
-			if (event.kbd.hasFlags(modifier->flag)) {
+			if (event.kbd.flags & modifier->flag) {
 				id += modifier->id;
 				id += "+";
 				fullKeyDesc += modifier->desc;


Commit: 6218028f0278208692a08739707f1c95102dea76
    https://github.com/scummvm/scummvm/commit/6218028f0278208692a08739707f1c95102dea76
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2020-02-13T07:57:02+01:00

Commit Message:
3DS: Add a note in the readme about using an older version of freetype2

Changed paths:
    backends/platform/3ds/README.md


diff --git a/backends/platform/3ds/README.md b/backends/platform/3ds/README.md
index 834976a..a85dee1 100644
--- a/backends/platform/3ds/README.md
+++ b/backends/platform/3ds/README.md
@@ -153,6 +153,11 @@ The following libraries can be downloaded with pacman:
 |  flac         |  3ds-flac             |
 |  curl         |  3ds-curl             |
 
+At the moment of writing, the version of `freetype2` packaged by devkitPro has an issue
+where it allocates too much data on the stack when ScummVM loads GUI themes.
+As a workaround, an older version can be used. Version 2.6.5 is known to work well. The
+instructions below can be used to compile it.
+
 At the moment of writing, `faad` is not in the devkitPro 3DS pacman repository. It
 can be compiled by following the instructions in the section below, in case it cannot
 be found through pacman.