summaryrefslogtreecommitdiff
path: root/core/os
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-01-02 09:37:16 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-01-02 09:37:16 -0300
commit432e2e77692e0c718b35ffddc0602a4193e13239 (patch)
tree05e893d7bfdb12e6afbd7a404d08d00226fbcc70 /core/os
parentdf5fa62ab955437f05bfd7acdf6ed61d6d9c827e (diff)
proper joy axis support as actions, can be configured and inquired, fixes #2317
Diffstat (limited to 'core/os')
-rw-r--r--core/os/input_event.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp
index 25b10a76d3..2f39567a7e 100644
--- a/core/os/input_event.cpp
+++ b/core/os/input_event.cpp
@@ -156,6 +156,7 @@ bool InputEvent::is_pressed() const {
case MOUSE_BUTTON: return mouse_button.pressed;
case JOYSTICK_BUTTON: return joy_button.pressed;
case SCREEN_TOUCH: return screen_touch.pressed;
+ case JOYSTICK_MOTION: return InputMap::get_singleton()->event_is_joy_motion_action_pressed(*this);
case ACTION: return action.pressed;
default: {}
}