diff options
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/scene_main_loop.cpp | 2 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index a6ef136b8..418f4362b 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -366,7 +366,7 @@ void SceneTree::input_text( const String& p_text ) { void SceneTree::input_event( const InputEvent& p_event ) { - if (is_editor_hint() && (p_event.type==InputEvent::JOYSTICK_MOTION || p_event.type==InputEvent::JOYSTICK_BUTTON)) + if (is_editor_hint() && (p_event.type==InputEvent::JOYPAD_MOTION || p_event.type==InputEvent::JOYPAD_BUTTON)) return; //avoid joy input on editor root_lock++; diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index e71426c4f..4c7114d09 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -2086,8 +2086,8 @@ void Viewport::_gui_input_event(InputEvent p_event) { } break; case InputEvent::ACTION: - case InputEvent::JOYSTICK_BUTTON: - case InputEvent::JOYSTICK_MOTION: + case InputEvent::JOYPAD_BUTTON: + case InputEvent::JOYPAD_MOTION: case InputEvent::KEY: { |