diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-10 10:03:38 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-10 10:03:38 +0200 |
| commit | 917fa80c18e83172040870d1a1cf613b51cf628c (patch) | |
| tree | 8ccea8ca56da8062790571cced8d3609b367b6cb /src/core/Pad.cpp | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| download | re3-917fa80c18e83172040870d1a1cf613b51cf628c.tar re3-917fa80c18e83172040870d1a1cf613b51cf628c.tar.gz re3-917fa80c18e83172040870d1a1cf613b51cf628c.tar.bz2 re3-917fa80c18e83172040870d1a1cf613b51cf628c.tar.lz re3-917fa80c18e83172040870d1a1cf613b51cf628c.tar.xz re3-917fa80c18e83172040870d1a1cf613b51cf628c.tar.zst re3-917fa80c18e83172040870d1a1cf613b51cf628c.zip | |
Diffstat (limited to 'src/core/Pad.cpp')
| -rw-r--r-- | src/core/Pad.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 6bbe00f2..ff7b2fb7 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -21,6 +21,7 @@ #include "Hud.h" #include "Text.h" #include "Timer.h" +#include "Record.h" #include "World.h" #include "Vehicle.h" #include "Ped.h" @@ -657,9 +658,14 @@ void CPad::Update(int16 unk) { OldState = NewState; - NewState = ReconcileTwoControllersInput(PCTempKeyState, PCTempJoyState); - NewState = ReconcileTwoControllersInput(PCTempMouseState, NewState); - +#if (defined GTA_PS2 || defined FIX_BUGS) + if (!CRecordDataForGame::IsPlayingBack() /* && !CRecordDataForChase::ShouldThisPadBeLeftAlone(unk) */) +#endif + { + NewState = ReconcileTwoControllersInput(PCTempKeyState, PCTempJoyState); + NewState = ReconcileTwoControllersInput(PCTempMouseState, NewState); + } + PCTempJoyState.Clear(); PCTempKeyState.Clear(); PCTempMouseState.Clear(); |