[Scummvm-git-logs] scummvm master -> 948f004a783ba8676eb49853dc2f6aadd2fec9e4
antoniou79
noreply at scummvm.org
Mon Aug 14 11:09:48 UTC 2023
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:
948f004a78 KEYMAPPER: Fix size of _joystickAxisPreviouslyPressed array
Commit: 948f004a783ba8676eb49853dc2f6aadd2fec9e4
https://github.com/scummvm/scummvm/commit/948f004a783ba8676eb49853dc2f6aadd2fec9e4
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-08-14T14:09:41+03:00
Commit Message:
KEYMAPPER: Fix size of _joystickAxisPreviouslyPressed array
It should include all the valid axis defined in defaultJoystickAxes so the size should now be 8
The 2 extra since the previous size (6) is due to the addition of support for HAT_X and HAT_Y axis.
This fix allows the HAT_X+/- and HAT_Y/+- to operate as valid incoming events when mapped to an action (see Keymapper::convertToIncomingEventType())
Changed paths:
backends/keymapper/keymapper.h
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h
index abb2dd445ef..cfe2f528fab 100644
--- a/backends/keymapper/keymapper.h
+++ b/backends/keymapper/keymapper.h
@@ -160,7 +160,7 @@ private:
KeymapArray _keymaps;
- bool _joystickAxisPreviouslyPressed[6];
+ bool _joystickAxisPreviouslyPressed[8]; // size should match the number of valid axis entries of defaultJoystickAxes (in hardware-input.cpp)
Keymap::KeymapMatch getMappedActions(const Event &event, Keymap::ActionArray &actions, Keymap::KeymapType keymapType) const;
Event executeAction(const Action *act, const Event &incomingEvent);
More information about the Scummvm-git-logs
mailing list