Minor cleanups (combined two identical enums, misc)

This commit is contained in:
Henrik Rydgard committed 2017-02-15 11:06:59 +01:00
1 parent 3cc344a1b7
commit 5c918da774
15 files changed
+36 -50

No files matched your search

+4 -6
View File
@@ -15,9 +15,9 @@ typedef DWORD (WINAPI *XInputGetState_t) (DWORD dwUserIndex, XINPUT_STATE* pStat
typedef DWORD (WINAPI *XInputSetState_t) (DWORD dwUserIndex, XINPUT_VIBRATION* pVibration);
typedef DWORD (WINAPI *XInputGetCapabilities_t) (DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities);
XInputGetState_t PPSSPP_XInputGetState = NULL;
XInputSetState_t PPSSPP_XInputSetState = NULL;
XInputGetCapabilities_t PPSSPP_XInputGetCapabilities = NULL;
static XInputGetState_t PPSSPP_XInputGetState = NULL;
static XInputSetState_t PPSSPP_XInputSetState = NULL;
static XInputGetCapabilities_t PPSSPP_XInputGetCapabilities = NULL;
static DWORD PPSSPP_XInputVersion = 0;
static HMODULE s_pXInputDLL = 0;
static int s_XInputDLLRefCount = 0;
@@ -97,10 +97,8 @@ static const unsigned int xinput_ctrl_map_size = sizeof(xinput_ctrl_map) / sizeo
XinputDevice::XinputDevice() {
if (LoadXInputDLL() != 0) {
ERROR_LOG(SCECTRL, "Failed to load XInput! DLL missing");
WARN_LOG(SCECTRL, "Failed to load XInput! DLL missing");
}
ZeroMemory( &this->prevState, sizeof(this->prevState) );
this->check_delay = 0;
this->gamepad_idx = -1;
}