aboutsummaryrefslogtreecommitdiff
path: root/scene/main/viewport.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-08 17:05:51 -0300
committerJuan Linietsky2017-01-08 17:06:33 -0300
commit547a57777b199f451305a6d4b6ad63fb0b2bd3ed (patch)
tree9fb9ce5851ea3ccc39c6ebce607ceeca771fd991 /scene/main/viewport.cpp
parent6323779596dea0db7f58afef7d3d3d5588ef20cb (diff)
downloadgodot-547a577.tar.gz
godot-547a577.tar.zst
godot-547a577.zip
renamed joystick to joypad everywhere around source code!
Diffstat (limited to 'scene/main/viewport.cpp')
-rw-r--r--scene/main/viewport.cpp4
1 files changed, 2 insertions, 2 deletions
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: {