diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 17:05:51 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 17:06:33 -0300 |
| commit | 547a57777b199f451305a6d4b6ad63fb0b2bd3ed (patch) | |
| tree | 9fb9ce5851ea3ccc39c6ebce607ceeca771fd991 /core/input_map.cpp | |
| parent | 6323779596dea0db7f58afef7d3d3d5588ef20cb (diff) | |
| download | redot-engine-547a57777b199f451305a6d4b6ad63fb0b2bd3ed.tar.gz | |
renamed joystick to joypad everywhere around source code!
Diffstat (limited to 'core/input_map.cpp')
| -rw-r--r-- | core/input_map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/input_map.cpp b/core/input_map.cpp index 27cd0f5596..0379131dd3 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -125,7 +125,7 @@ List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const same=(e.key.scancode==p_event.key.scancode && (p_mod_ignore || e.key.mod == p_event.key.mod)); } break; - case InputEvent::JOYSTICK_BUTTON: { + case InputEvent::JOYPAD_BUTTON: { same=(e.joy_button.button_index==p_event.joy_button.button_index); @@ -135,7 +135,7 @@ List<InputEvent>::Element *InputMap::_find_event(List<InputEvent> &p_list,const same=(e.mouse_button.button_index==p_event.mouse_button.button_index); } break; - case InputEvent::JOYSTICK_MOTION: { + case InputEvent::JOYPAD_MOTION: { same=(e.joy_motion.axis==p_event.joy_motion.axis && (e.joy_motion.axis_value < 0) == (p_event.joy_motion.axis_value < 0)); |