summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-26 19:11:19 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-26 19:11:19 +0200
commitb7ee3792df72826b351a6fac86d7aad9caeea632 (patch)
tree55ea105f43008bb7a7aed4175ea76523b1ab5a9e /src
parentA few fixes (diff)
downloadre3-b7ee3792df72826b351a6fac86d7aad9caeea632.tar
re3-b7ee3792df72826b351a6fac86d7aad9caeea632.tar.gz
re3-b7ee3792df72826b351a6fac86d7aad9caeea632.tar.bz2
re3-b7ee3792df72826b351a6fac86d7aad9caeea632.tar.lz
re3-b7ee3792df72826b351a6fac86d7aad9caeea632.tar.xz
re3-b7ee3792df72826b351a6fac86d7aad9caeea632.tar.zst
re3-b7ee3792df72826b351a6fac86d7aad9caeea632.zip
Diffstat (limited to '')
-rw-r--r--src/core/ControllerConfig.h14
-rw-r--r--src/skel/win/win.h1
2 files changed, 6 insertions, 9 deletions
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h
index f117c047..7d0e1073 100644
--- a/src/core/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
@@ -1,5 +1,9 @@
#pragma once
+#if defined RW_D3D9 || defined RWLIBS
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
+#endif
// based on x-gtasa
@@ -126,14 +130,8 @@ public:
GlfwJoyState m_OldState;
GlfwJoyState m_NewState;
#else
- #ifdef __DINPUT_INCLUDED__
- DIJOYSTATE2 m_OldState;
- DIJOYSTATE2 m_NewState;
- #else
- // this is here to fix the size of a struct
- // TODO: find a better was a remove this
- uint32 ___padd[0x110 / 4 * 2];
- #endif
+ DIJOYSTATE2 m_OldState;
+ DIJOYSTATE2 m_NewState;
#endif
wchar m_aActionNames[MAX_CONTROLLERACTIONS][ACTIONNAME_LENGTH];
bool m_aButtonStates[MAX_BUTTONS];
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index 0e63502e..d05e3951 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -63,7 +63,6 @@ struct tJoy
bool m_bInitialised;
bool m_bHasAxisZ;
bool m_bHasAxisR;
- char _pad0;
int m_nVendorID;
int m_nProductID;
};