diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-24 14:32:09 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-24 14:32:09 +0200 |
| commit | 6e4957d429c845731fe3d4b93198b29dd1d6da41 (patch) | |
| tree | 1a4e535f030b09d73ee0e0f3d87d9dc92d9acae4 | |
| parent | 7d89a8b7481c1e172958010366b3735b6d000591 (diff) | |
| parent | 3b12f9ea8254e6c979e14b6cc5241edbff5c797a (diff) | |
Merge pull request #4401 from Hinsbart/fix_is_action_bug
add sign comparison for joystick axis events in InputMap::_find_event
| -rw-r--r-- | core/input_map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/input_map.cpp b/core/input_map.cpp index 5a9b035771..17e98902a1 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -106,7 +106,7 @@ List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const } break; case InputEvent::JOYSTICK_MOTION: { - same=(e.joy_motion.axis==p_event.joy_motion.axis); + same=(e.joy_motion.axis==p_event.joy_motion.axis && (e.joy_motion.axis_value < 0) == (p_event.joy_motion.axis_value < 0)); } break; } |