summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-08 01:56:20 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-08 01:56:20 +0100
commit8d3864a4e5830785bf7721cce5896fa7dc7e96d5 (patch)
tree61c9adf30e877caff275da5d581c0d1089143ba6
parentFix wrong define (diff)
downloadre3-8d3864a4e5830785bf7721cce5896fa7dc7e96d5.tar
re3-8d3864a4e5830785bf7721cce5896fa7dc7e96d5.tar.gz
re3-8d3864a4e5830785bf7721cce5896fa7dc7e96d5.tar.bz2
re3-8d3864a4e5830785bf7721cce5896fa7dc7e96d5.tar.lz
re3-8d3864a4e5830785bf7721cce5896fa7dc7e96d5.tar.xz
re3-8d3864a4e5830785bf7721cce5896fa7dc7e96d5.tar.zst
re3-8d3864a4e5830785bf7721cce5896fa7dc7e96d5.zip
-rw-r--r--src/control/Record.cpp10
-rw-r--r--src/control/Record.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/control/Record.cpp b/src/control/Record.cpp
index 8a23ffde..7f636ec2 100644
--- a/src/control/Record.cpp
+++ b/src/control/Record.cpp
@@ -391,15 +391,17 @@ void CRecordDataForChase::ProcessControlCars(void)
}
}
-#if (defined(GTA_PS2) || defined(FIX_BUGS))
bool CRecordDataForChase::ShouldThisPadBeLeftAlone(uint8 pad)
{
// may be wrong
- if (Status == STATE_NONE || Status == STATE_PLAYBACK)
+ if (Status == STATE_PLAYBACK_INIT) // this is useless but ps2 def checks if it's STATE_PLAYBACK_INIT
return false;
- return pad != 0;
+
+ if (Status == STATE_RECORD)
+ return pad != 0;
+
+ return false;
}
-#endif
void CRecordDataForChase::GiveUsACar(int32 mi, CVector pos, float angle, CAutomobile** ppCar, uint8 colour1, uint8 colour2)
{
diff --git a/src/control/Record.h b/src/control/Record.h
index 8b55b1f4..6a94c408 100644
--- a/src/control/Record.h
+++ b/src/control/Record.h
@@ -57,9 +57,7 @@ public:
static void RestoreInfoForMatrix(CMatrix&, CCarStateEachFrame*);
static void RestoreInfoForCar(CAutomobile*, CCarStateEachFrame*, bool);
static void ProcessControlCars(void);
-#if (defined(GTA_PS2) || defined(FIX_BUGS))
static bool ShouldThisPadBeLeftAlone(uint8 pad);
-#endif
static void GiveUsACar(int32, CVector, float, CAutomobile**, uint8, uint8);
static void StartChaseScene(float);
static void CleanUpChaseScene(void);