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/windows/os_windows.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/windows/os_windows.cpp')
| -rw-r--r-- | platform/windows/os_windows.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 34ea9cd15..28e55b531 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -51,7 +51,7 @@ #include "globals.h" #include "io/marshalls.h" -#include "joystick.h" +#include "joypad.h" #include "shlobj.h" #include <regstr.h> @@ -714,7 +714,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd,UINT uMsg, WPARAM wParam, LPARAM lParam) { #endif case WM_DEVICECHANGE: { - joystick->probe_joysticks(); + joypad->probe_joypads(); } break; case WM_SETCURSOR: { @@ -1120,7 +1120,7 @@ void OS_Windows::initialize(const VideoMode& p_desired,int p_video_driver,int p_ visual_server->init(); input = memnew( InputDefault ); - joystick = memnew (joystick_windows(input, &hWnd)); + joypad = memnew (joypad_windows(input, &hWnd)); AudioDriverManagerSW::get_driver(p_audio_driver)->set_singleton(); @@ -1253,7 +1253,7 @@ void OS_Windows::finalize() { main_loop=NULL; - memdelete(joystick); + memdelete(joypad); memdelete(input); visual_server->finish(); @@ -1928,7 +1928,7 @@ void OS_Windows::process_events() { MSG msg; - last_id = joystick->process_joysticks(last_id); + last_id = joypad->process_joypads(last_id); while(PeekMessageW(&msg,NULL,0,0,PM_REMOVE)) { |