aboutsummaryrefslogtreecommitdiff
path: root/platform/uwp/os_uwp.h
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-08 17:05:51 -0300
committerJuan Linietsky2017-01-08 17:06:33 -0300
commit547a57777b199f451305a6d4b6ad63fb0b2bd3ed (patch)
tree9fb9ce5851ea3ccc39c6ebce607ceeca771fd991 /platform/uwp/os_uwp.h
parent6323779596dea0db7f58afef7d3d3d5588ef20cb (diff)
downloadgodot-547a577.tar.gz
godot-547a577.tar.zst
godot-547a577.zip
renamed joystick to joypad everywhere around source code!
Diffstat (limited to 'platform/uwp/os_uwp.h')
-rw-r--r--platform/uwp/os_uwp.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h
index c50d34aca..82376dd2f 100644
--- a/platform/uwp/os_uwp.h
+++ b/platform/uwp/os_uwp.h
@@ -55,7 +55,7 @@
#include <stdio.h>
#include "main/input_default.h"
-#include "joystick_uwp.h"
+#include "joypad_uwp.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
@@ -85,7 +85,7 @@ public:
private:
enum {
- JOYSTICKS_MAX = 8,
+ JOYPADS_MAX = 8,
JOY_AXIS_COUNT = 6,
MAX_JOY_AXIS = 32768, // I've no idea
KEY_EVENT_BUFFER_SIZE=512
@@ -137,7 +137,7 @@ private:
InputDefault *input;
- JoystickUWP^ joystick;
+ JoypadUWP^ joypad;
Windows::System::Display::DisplayRequest^ display_request;