summaryrefslogtreecommitdiff
path: root/platform/windows
diff options
context:
space:
mode:
authorhondres <liu.gam3@gmail.com>2016-01-08 00:40:41 +0100
committerhondres <liu.gam3@gmail.com>2016-01-08 00:40:41 +0100
commitc632c13c66db715b816390f0734f2b1839a7ff3e (patch)
tree01d0c5800712b9ac5bcde597edb91d9855519cb7 /platform/windows
parent79c1392d17156aeb8d6a2abca16db59b1f8312cc (diff)
Add some joystick functions to input. Enables manipulation of mappings at runtime
Diffstat (limited to 'platform/windows')
-rw-r--r--platform/windows/os_windows.cpp7
-rw-r--r--platform/windows/os_windows.h3
2 files changed, 10 insertions, 0 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 95bfa2ea94..92154532ca 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -2099,6 +2099,13 @@ String OS_Windows::get_data_dir() const {
}
+bool OS_Windows::is_joy_known(int p_device) {
+ return input->is_joy_mapped(p_device);
+}
+
+String OS_Windows::get_joy_guid(int p_device) const {
+ return input->get_joy_guid_remapped(p_device);
+}
OS_Windows::OS_Windows(HINSTANCE _hInstance) {
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index dfa2b40595..a738ca8028 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -270,6 +270,9 @@ public:
virtual bool get_swap_ok_cancel() { return true; }
+ virtual bool is_joy_known(int p_device);
+ virtual String get_joy_guid(int p_device) const;
+
OS_Windows(HINSTANCE _hInstance);
~OS_Windows();