a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove struct workaround in CControllerConfigManager

This commit is contained in:
Sergeanur 2020-04-26 20:11:19 +03:00
parent 1a44bcccd5
commit b7ee3792df
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/ControllerConfig.h
View File

@ -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];

1
src/skel/win/win.h
View File

@ -63,7 +63,6 @@ struct tJoy
bool m_bInitialised;
bool m_bHasAxisZ;
bool m_bHasAxisR;
char _pad0;
int m_nVendorID;
int m_nProductID;
};