a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 09:00:01 +00:00
Code Issues Projects Releases Wiki Activity

A few fixes

Browse source
This commit is contained in:
Sergeanur 2020-04-26 14:18:34 +03:00
parent 4f763cba49
commit 1a44bcccd5
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/ControllerConfig.h
View file

@ -122,12 +122,18 @@ public:
}; };
bool m_bFirstCapture; bool m_bFirstCapture;
#ifdef __DINPUT_INCLUDED__ #if defined RW_GL3
DIJOYSTATE2 m_OldState;
DIJOYSTATE2 m_NewState;
#elif defined RW_GL3
GlfwJoyState m_OldState; GlfwJoyState m_OldState;
GlfwJoyState m_NewState; 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 #endif
wchar m_aActionNames[MAX_CONTROLLERACTIONS][ACTIONNAME_LENGTH]; wchar m_aActionNames[MAX_CONTROLLERACTIONS][ACTIONNAME_LENGTH];
bool m_aButtonStates[MAX_BUTTONS]; bool m_aButtonStates[MAX_BUTTONS];
@ -204,6 +210,8 @@ public:
void ResetSettingOrder (e_ControllerAction action); void ResetSettingOrder (e_ControllerAction action);
}; };
//VALIDATE_SIZE(CControllerConfigManager, 0x143C); #ifndef RW_GL3
VALIDATE_SIZE(CControllerConfigManager, 0x143C);
#endif
extern CControllerConfigManager ControlsManager; extern CControllerConfigManager ControlsManager;

4
src/core/config.h
View file

@ -200,7 +200,9 @@ enum Config {
//#define PS2_ALTERNATIVE_CARSPLASH // unused on PS2 //#define PS2_ALTERNATIVE_CARSPLASH // unused on PS2
// Pad // Pad
// #define XINPUT #ifndef RW_GL3
#define XINPUT
#endif
#define KANGAROO_CHEAT #define KANGAROO_CHEAT
#define REGISTER_START_BUTTON #define REGISTER_START_BUTTON