mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 04:30:00 +00:00
Remove struct workaround in CControllerConfigManager
This commit is contained in:
parent
1a44bcccd5
commit
b7ee3792df
|
@ -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];
|
||||
|
|
|
@ -63,7 +63,6 @@ struct tJoy
|
|||
bool m_bInitialised;
|
||||
bool m_bHasAxisZ;
|
||||
bool m_bHasAxisR;
|
||||
char _pad0;
|
||||
int m_nVendorID;
|
||||
int m_nProductID;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue