summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-26 13:18:34 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-26 13:18:34 +0200
commit1a44bcccd5a30306456e6abb36a9a754cee3c7f2 (patch)
treed6bd0f94110e4b0eb114471f487321105764f57c /src
parentFix compilation error (diff)
downloadre3-1a44bcccd5a30306456e6abb36a9a754cee3c7f2.tar
re3-1a44bcccd5a30306456e6abb36a9a754cee3c7f2.tar.gz
re3-1a44bcccd5a30306456e6abb36a9a754cee3c7f2.tar.bz2
re3-1a44bcccd5a30306456e6abb36a9a754cee3c7f2.tar.lz
re3-1a44bcccd5a30306456e6abb36a9a754cee3c7f2.tar.xz
re3-1a44bcccd5a30306456e6abb36a9a754cee3c7f2.tar.zst
re3-1a44bcccd5a30306456e6abb36a9a754cee3c7f2.zip
Diffstat (limited to '')
-rw-r--r--src/core/ControllerConfig.h18
-rw-r--r--src/core/config.h4
2 files changed, 16 insertions, 6 deletions
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h
index 76f9882b..f117c047 100644
--- a/src/core/ControllerConfig.h
+++ b/src/core/ControllerConfig.h
@@ -122,12 +122,18 @@ public:
};
bool m_bFirstCapture;
-#ifdef __DINPUT_INCLUDED__
- DIJOYSTATE2 m_OldState;
- DIJOYSTATE2 m_NewState;
-#elif defined RW_GL3
+#if defined RW_GL3
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
#endif
wchar m_aActionNames[MAX_CONTROLLERACTIONS][ACTIONNAME_LENGTH];
bool m_aButtonStates[MAX_BUTTONS];
@@ -204,6 +210,8 @@ public:
void ResetSettingOrder (e_ControllerAction action);
};
-//VALIDATE_SIZE(CControllerConfigManager, 0x143C);
+#ifndef RW_GL3
+VALIDATE_SIZE(CControllerConfigManager, 0x143C);
+#endif
extern CControllerConfigManager ControlsManager; \ No newline at end of file
diff --git a/src/core/config.h b/src/core/config.h
index 80e2ff19..2cf8ec88 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -200,7 +200,9 @@ enum Config {
//#define PS2_ALTERNATIVE_CARSPLASH // unused on PS2
// Pad
-// #define XINPUT
+#ifndef RW_GL3
+#define XINPUT
+#endif
#define KANGAROO_CHEAT
#define REGISTER_START_BUTTON