merge attempt

This commit is contained in:
Nikolay Korolev
2020-12-19 03:21:04 +03:00
68 changed files with 2149 additions and 316 deletions

View File

@@ -69,12 +69,17 @@ void CRecordDataForChase::ProcessControlCars(void)
{
}
#if (defined(GTA_PS2) || defined(FIX_BUGS))
bool CRecordDataForChase::ShouldThisPadBeLeftAlone(uint8 pad)
{
// may be wrong
if (Status == STATE_PLAYBACK_INIT) // this is useless but ps2 def checks if it's STATE_PLAYBACK_INIT
return false;
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)
{