Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp
This commit is contained in:
Sergeanur
2021-01-22 15:04:09 +02:00
130 changed files with 92 additions and 669 deletions

View File

@@ -4986,7 +4986,6 @@ CAutomobile::HasCarStoppedBecauseOfLight(void)
return false;
}
// --MIAMI: Done
void
CPed::DeadPedMakesTyresBloody(void)
{
@@ -5010,7 +5009,6 @@ CPed::DeadPedMakesTyresBloody(void)
}
}
// --MIAMI: Done
void
CPed::MakeTyresMuddySectorList(CPtrList &list)
{