summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-11 01:03:42 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-11 01:03:42 +0200
commit92b6d775d67d01aab0706564b2cae3714bcf05b0 (patch)
tree714f32c096807d919f95ff4c2d31990f3e34b08c /src/core
parentMerge branch 'master' into garages_dev (diff)
downloadre3-92b6d775d67d01aab0706564b2cae3714bcf05b0.tar
re3-92b6d775d67d01aab0706564b2cae3714bcf05b0.tar.gz
re3-92b6d775d67d01aab0706564b2cae3714bcf05b0.tar.bz2
re3-92b6d775d67d01aab0706564b2cae3714bcf05b0.tar.lz
re3-92b6d775d67d01aab0706564b2cae3714bcf05b0.tar.xz
re3-92b6d775d67d01aab0706564b2cae3714bcf05b0.tar.zst
re3-92b6d775d67d01aab0706564b2cae3714bcf05b0.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Pad.cpp3
-rw-r--r--src/core/Timer.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index b03272f9..f83998b8 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -26,6 +26,7 @@
#include "Vehicle.h"
#include "Ped.h"
#include "Population.h"
+#include "Record.h"
#include "Replay.h"
#include "Weather.h"
#include "win.h"
@@ -969,7 +970,7 @@ void CPad::Update(int16 unk)
OldState = NewState;
#if (defined GTA_PS2 || defined FIX_BUGS)
- if (!CRecordDataForGame::IsPlayingBack() /* && !CRecordDataForChase::ShouldThisPadBeLeftAlone(unk) */)
+ if (!CRecordDataForGame::IsPlayingBack() && !CRecordDataForChase::ShouldThisPadBeLeftAlone(unk))
#endif
{
NewState = ReconcileTwoControllersInput(PCTempKeyState, PCTempJoyState);
diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
index 3cd6862c..d0bb6c8b 100644
--- a/src/core/Timer.cpp
+++ b/src/core/Timer.cpp
@@ -138,7 +138,7 @@ void CTimer::Update(void)
m_snTimeInMilliseconds = m_snPreviousTimeInMilliseconds + 60;
}
- if ( CRecordDataForChase::Status == RECORDSTATE_1 )
+ if ( CRecordDataForChase::IsRecording() )
{
ms_fTimeStep = 1.0f;
m_snTimeInMilliseconds = m_snPreviousTimeInMilliseconds + 16;