ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2036 from pcca-matrix/develop 

Fix Random input in N-Rage Plugin (https://github.com/project64/proje…
This commit is contained in:
zilmar 2021-05-15 17:01:19 +09:30 committed by GitHub
parent 74c8082d0e 7616a26160
commit 09e4a6d211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/nragev20/XInputController.cpp
View File

@ -163,11 +163,12 @@ void AxisDeadzone( SHORT &AxisValue, long lDeadZoneValue, float fDeadZoneRelati
void GetXInputControllerKeys( const int indexController, LPDWORD Keys ) void GetXInputControllerKeys( const int indexController, LPDWORD Keys )
{ {
if (fnXInputGetState == NULL)
if (fnXInputGetState == NULL)
{ {
return; return;
} }
using namespace N64_BUTTONS; using namespace N64_BUTTONS;
LPCONTROLLER pcController = &g_pcControllers[indexController]; LPCONTROLLER pcController = &g_pcControllers[indexController];
@ -178,22 +179,25 @@ void GetXInputControllerKeys( const int indexController, LPDWORD Keys )
if ( !gController->bConfigured ) if ( !gController->bConfigured )
return; return;
ULONGLONG time = GetTickCount() / 1000;
if (g_pcControllers[indexController].XcheckTime != NULL && (time - g_pcControllers[indexController].XcheckTime) < 3)
return;
DWORD result; DWORD result;
XINPUT_STATE state; XINPUT_STATE state;
ULONGLONG time = GetTickCount() / 1000;
if (g_pcControllers[indexController].XcheckTime != NULL && (time - g_pcControllers[indexController].XcheckTime) < 3)
return;
result = fnXInputGetState(gController->nControl, &state); result = fnXInputGetState(gController->nControl, &state);
if (result == ERROR_DEVICE_NOT_CONNECTED) { if (result == ERROR_DEVICE_NOT_CONNECTED) {
g_pcControllers[indexController].XcheckTime = time; g_pcControllers[indexController].XcheckTime = time;
} }
else { else {
g_pcControllers[indexController].XcheckTime = NULL; g_pcControllers[indexController].XcheckTime = NULL;
} }
if( result != ERROR_SUCCESS )
return;
DWORD wButtons = state.Gamepad.wButtons; DWORD wButtons = state.Gamepad.wButtons;
if( pcController->bPadDeadZone > 0 ) if( pcController->bPadDeadZone > 0 )