diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-08 21:29:57 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-08 21:33:37 +0100 |
| commit | 5bfa4227b309062b3ec9651a5d0c1e560a3f9863 (patch) | |
| tree | 0d8ad4e601cda85175e230a8f595aae6ea3b88c0 /platform/osx | |
| parent | c2310b41fa71ce94c2cc127c55b39b8ba07ab4c3 (diff) | |
Finish replacement of joystick by joypad
Some parts were forgotten in 547a577.
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/SCsub | 2 | ||||
| -rw-r--r-- | platform/osx/joypad_osx.cpp (renamed from platform/osx/joystick_osx.cpp) | 3 | ||||
| -rw-r--r-- | platform/osx/joypad_osx.h (renamed from platform/osx/joystick_osx.h) | 0 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/platform/osx/SCsub b/platform/osx/SCsub index c8e0e17612..00f23687cf 100644 --- a/platform/osx/SCsub +++ b/platform/osx/SCsub @@ -9,7 +9,7 @@ files = [ 'sem_osx.cpp', # 'context_gl_osx.cpp', 'dir_access_osx.mm', - 'joystick_osx.cpp', + 'joypad_osx.cpp', ] env.Program('#bin/godot', files) diff --git a/platform/osx/joystick_osx.cpp b/platform/osx/joypad_osx.cpp index 18c714e922..4a8744d3aa 100644 --- a/platform/osx/joystick_osx.cpp +++ b/platform/osx/joypad_osx.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* joypad_osx.cpp */ +/* joypad_osx.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "joypad_osx.h" + #include <machine/endian.h> #define GODOT_JOY_LOOP_RUN_MODE CFSTR("GodotJoypad") diff --git a/platform/osx/joystick_osx.h b/platform/osx/joypad_osx.h index aafd82880d..aafd82880d 100644 --- a/platform/osx/joystick_osx.h +++ b/platform/osx/joypad_osx.h diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 548d33ebfa..a66f6abba5 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1122,7 +1122,7 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi physics_2d_server->init(); input = memnew( InputDefault ); - joystick_osx = memnew( JoystickOSX ); + joypad_osx = memnew( JoypadOSX ); _ensure_data_dir(); @@ -1165,7 +1165,7 @@ void OS_OSX::finalize() { spatial_sound_2d_server->finish(); memdelete(spatial_sound_2d_server); - memdelete(joystick_osx); + memdelete(joypad_osx); memdelete(input); memdelete(sample_manager); @@ -1738,7 +1738,7 @@ void OS_OSX::run() { while (!force_quit) { process_events(); // get rid of pending events - last_id = joystick_osx->process_joysticks(last_id); + last_id = joypad_osx->process_joypads(last_id); if (Main::iteration()==true) break; }; |