diff options
| author | Juan Linietsky | 2017-01-08 17:05:51 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-08 17:06:33 -0300 |
| commit | 547a57777b199f451305a6d4b6ad63fb0b2bd3ed (patch) | |
| tree | 9fb9ce5851ea3ccc39c6ebce607ceeca771fd991 /platform/x11/os_x11.cpp | |
| parent | 6323779596dea0db7f58afef7d3d3d5588ef20cb (diff) | |
| download | godot-547a577.tar.gz godot-547a577.tar.zst godot-547a577.zip | |
renamed joystick to joypad everywhere around source code!
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index e560b46d4..d1c9c866c 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -458,7 +458,7 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi input = memnew( InputDefault ); #ifdef JOYDEV_ENABLED - joystick = memnew( joystick_linux(input)); + joypad = memnew( joypad_linux(input)); #endif _ensure_data_dir(); } @@ -479,7 +479,7 @@ void OS_X11::finalize() { //} #ifdef JOYDEV_ENABLED - memdelete(joystick); + memdelete(joypad); #endif memdelete(input); @@ -1932,7 +1932,7 @@ void OS_X11::run() { process_xevents(); // get rid of pending events #ifdef JOYDEV_ENABLED - event_id = joystick->process_joysticks(event_id); + event_id = joypad->process_joypads(event_id); #endif if (Main::iteration()==true) break; |