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

Merge branch 'master' of github.com:gtamodding/re3

Browse source
This commit is contained in:
aap 2020-03-28 09:34:25 +01:00
parent f5195ca185 cd913404a3
commit 6a14457614
3 changed files with 305 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/Pad.cpp
View file

@ -7,7 +7,7 @@
#include "common.h" #include "common.h"
#ifdef XINPUT #ifdef XINPUT
#include <Xinput.h> #include <Xinput.h>
#pragma comment( lib, "Xinput.lib" ) #pragma comment( lib, "Xinput9_1_0.lib" )
#endif #endif
#include "patcher.h" #include "patcher.h"
#include "Pad.h" #include "Pad.h"
@ -590,6 +590,24 @@ void CPad::AffectFromXinput(uint32 pad)
PCTempJoyState.RightStickX = (int32)(rx * 128.0f); PCTempJoyState.RightStickX = (int32)(rx * 128.0f);
PCTempJoyState.RightStickY = (int32)(ry * 128.0f); PCTempJoyState.RightStickY = (int32)(ry * 128.0f);
} }
XINPUT_VIBRATION VibrationState;
memset(&VibrationState, 0, sizeof(XINPUT_VIBRATION));
uint16 iLeftMotor = (uint16)((float)ShakeFreq / 255.0f * (float)0xffff);
uint16 iRightMotor = (uint16)((float)ShakeFreq / 255.0f * (float)0xffff);
if (ShakeDur < CTimer::GetTimeStepInMilliseconds())
ShakeDur = 0;
else
ShakeDur -= CTimer::GetTimeStepInMilliseconds();
if (ShakeDur == 0) ShakeFreq = 0;
VibrationState.wLeftMotorSpeed = iLeftMotor;
VibrationState.wRightMotorSpeed = iRightMotor;
XInputSetState(pad, &VibrationState);
} }
} }
#endif #endif
@ -617,6 +635,7 @@ void CPad::UpdatePads(void)
if ( bUpdate ) if ( bUpdate )
{ {
GetPad(0)->Update(0); GetPad(0)->Update(0);
GetPad(1)->Update(0);
} }
#if defined(MASTER) && !defined(XINPUT) #if defined(MASTER) && !defined(XINPUT)