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

src/weapons/BulletInfo.cpp

@@ -25,8 +25,6 @@
 #include "SurfaceTable.h"
 #include "Heli.h"
 
-// --MIAMI: file done
-
 #ifdef SQUEEZE_PERFORMANCE
 uint32 bulletInfoInUse;
 #endif

src/weapons/ProjectileInfo.cpp

@@ -17,8 +17,6 @@
 uint32 projectileInUse;
 #endif
 
-// --MIAMI: file done except TODOs
-
 CProjectileInfo gaProjectileInfo[NUM_PROJECTILES];
 CProjectile *CProjectileInfo::ms_apProjectile[NUM_PROJECTILES];
 

src/weapons/ShotInfo.cpp

@@ -10,8 +10,6 @@
 #include "Ped.h"
 #include "Fire.h"
 
-// --MIAMI: file done
-
 CShotInfo gaShotInfo[NUMSHOTINFOS];
 float CShotInfo::ms_afRandTable[20];
 

src/weapons/Weapon.cpp

@@ -3173,7 +3173,6 @@ CWeapon::HasWeaponAmmoToBeUsed(void)
 		return m_nAmmoTotal != 0;
 }
 
-// --MIAMI: Done
 bool
 CPed::IsPedDoingDriveByShooting(void)
 {