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 /platform/uwp/os_uwp.cpp | |
| parent | 6323779596dea0db7f58afef7d3d3d5588ef20cb (diff) | |
renamed joystick to joypad everywhere around source code!
Diffstat (limited to 'platform/uwp/os_uwp.cpp')
| -rw-r--r-- | platform/uwp/os_uwp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index 387cfe579f..34977bc048 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -285,8 +285,8 @@ void OSUWP::initialize(const VideoMode& p_desired,int p_video_driver,int p_audio input = memnew( InputDefault ); - joystick = ref new JoystickUWP(input); - joystick->register_events(); + joypad = ref new JoypadUWP(input); + joypad->register_events(); AudioDriverManagerSW::get_driver(p_audio_driver)->set_singleton(); @@ -429,7 +429,7 @@ void OSUWP::finalize() { physics_2d_server->finish(); memdelete(physics_2d_server); - joystick = nullptr; + joypad = nullptr; } void OSUWP::finalize_core() { @@ -725,7 +725,7 @@ uint64_t OSUWP::get_ticks_usec() const { void OSUWP::process_events() { - last_id = joystick->process_controllers(last_id); + last_id = joypad->process_controllers(last_id); process_key_events(); } |