diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-04-26 12:25:03 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-04-26 12:29:50 +0200 |
| commit | 6c1a1f7cd20a2674f33b5318e6e07a3a28d016f6 (patch) | |
| tree | 7a01b47b48a106ca6ff9154cc5c14d3baf54c22f /src/core/ControllerConfig.h | |
| parent | update librw (diff) | |
| download | re3-6c1a1f7cd20a2674f33b5318e6e07a3a28d016f6.tar re3-6c1a1f7cd20a2674f33b5318e6e07a3a28d016f6.tar.gz re3-6c1a1f7cd20a2674f33b5318e6e07a3a28d016f6.tar.bz2 re3-6c1a1f7cd20a2674f33b5318e6e07a3a28d016f6.tar.lz re3-6c1a1f7cd20a2674f33b5318e6e07a3a28d016f6.tar.xz re3-6c1a1f7cd20a2674f33b5318e6e07a3a28d016f6.tar.zst re3-6c1a1f7cd20a2674f33b5318e6e07a3a28d016f6.zip | |
Diffstat (limited to 'src/core/ControllerConfig.h')
| -rw-r--r-- | src/core/ControllerConfig.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/core/ControllerConfig.h b/src/core/ControllerConfig.h index 82174343..76f9882b 100644 --- a/src/core/ControllerConfig.h +++ b/src/core/ControllerConfig.h @@ -96,6 +96,16 @@ class CControllerState; #define ACTIONNAME_LENGTH 40 +#ifdef RW_GL3 +struct GlfwJoyState { + int8 id; + bool isGamepad; + uint8 numButtons; + uint8* buttons; + bool mappedButtons[17]; +}; +#endif + class CControllerConfigManager { public: @@ -115,8 +125,9 @@ public: #ifdef __DINPUT_INCLUDED__ DIJOYSTATE2 m_OldState; DIJOYSTATE2 m_NewState; -#else - uint32 ___padd[0x110 / 4 * 2]; +#elif defined RW_GL3 + GlfwJoyState m_OldState; + GlfwJoyState m_NewState; #endif wchar m_aActionNames[MAX_CONTROLLERACTIONS][ACTIONNAME_LENGTH]; bool m_aButtonStates[MAX_BUTTONS]; @@ -193,6 +204,6 @@ public: void ResetSettingOrder (e_ControllerAction action); }; -VALIDATE_SIZE(CControllerConfigManager, 0x143C); +//VALIDATE_SIZE(CControllerConfigManager, 0x143C); extern CControllerConfigManager ControlsManager;
\ No newline at end of file |