diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-12 11:06:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 11:06:12 +0200 |
| commit | fa0f5542cc0627f06f793dcc3c2615dff242bc5a (patch) | |
| tree | 6822b7dadbfde60e7e366e857365d47a51a4fc9b /src/core/Pad.cpp | |
| parent | Merge pull request #399 from saml1er/master (diff) | |
| parent | Update README.md (diff) | |
| download | re3-fa0f5542cc0627f06f793dcc3c2615dff242bc5a.tar re3-fa0f5542cc0627f06f793dcc3c2615dff242bc5a.tar.gz re3-fa0f5542cc0627f06f793dcc3c2615dff242bc5a.tar.bz2 re3-fa0f5542cc0627f06f793dcc3c2615dff242bc5a.tar.lz re3-fa0f5542cc0627f06f793dcc3c2615dff242bc5a.tar.xz re3-fa0f5542cc0627f06f793dcc3c2615dff242bc5a.tar.zst re3-fa0f5542cc0627f06f793dcc3c2615dff242bc5a.zip | |
Diffstat (limited to 'src/core/Pad.cpp')
| -rw-r--r-- | src/core/Pad.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp index 6efbeb8e..f83998b8 100644 --- a/src/core/Pad.cpp +++ b/src/core/Pad.cpp @@ -21,10 +21,12 @@ #include "Hud.h" #include "Text.h" #include "Timer.h" +#include "Record.h" #include "World.h" #include "Vehicle.h" #include "Ped.h" #include "Population.h" +#include "Record.h" #include "Replay.h" #include "Weather.h" #include "win.h" @@ -967,9 +969,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(); |