4 files changed, 34 insertions, 16 deletions

diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 5f78e2a9..aad31bbf 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -72,6 +72,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 	bFixedColour = false;
 	bBigWheels = false;
 	bWaterTight = false;
+	bTankDetonateCars = true;
 
 	SetModelIndex(id);
 
@@ -332,7 +333,7 @@ CAutomobile::ProcessControl(void)
 	bool playerRemote = false;
 	switch(GetStatus()){
 	case STATUS_PLAYER_REMOTE:
-		if(CPad::GetPad(0)->WeaponJustDown()){
+		if(CPad::GetPad(0)->WeaponJustDown() && !bDisableRemoteDetonation){
 			BlowUpCar(FindPlayerPed());
 			CRemote::TakeRemoteControlledCarFromPlayer();
 		}
@@ -4148,7 +4149,7 @@ CAutomobile::BlowUpCarsInPath(void)
 {
 	int i;
 
-	if(m_vecMoveSpeed.Magnitude() > 0.1f)
+	if(m_vecMoveSpeed.Magnitude() > 0.1f && bTankDetonateCars)
 		for(i = 0; i < m_nCollisionRecords; i++)
 			if(m_aCollisionRecords[i] &&
 			   m_aCollisionRecords[i]->IsVehicle() &&
@@ -4610,6 +4611,18 @@ CAutomobile::SetAllTaxiLights(bool set)
 	m_sAllTaxiLights = set;
 }
 
+void
+CAutomobile::TellHeliToGoToCoors(float x, float y, float z, uint8 speed)
+{
+	AutoPilot.m_nCarMission = MISSION_HELI_FLYTOCOORS;
+	AutoPilot.m_vecDestinationCoors.x = x;
+	AutoPilot.m_vecDestinationCoors.y = y;
+	AutoPilot.m_vecDestinationCoors.z = z;
+	AutoPilot.m_nCruiseSpeed = speed;
+	SetStatus(STATUS_PHYSICS);
+	//TODO(MIAMI)
+}
+
 #ifdef COMPATIBLE_SAVES
 void
 CAutomobile::Save(uint8*& buf)
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h
index 8c5c8f8e..e096465e 100644
--- a/src/vehicles/Automobile.h
+++ b/src/vehicles/Automobile.h
@@ -91,6 +91,7 @@ public:
 	uint8 bWaterTight : 1;	// no damage for non-player peds
 	uint8 bNotDamagedUpsideDown : 1;
 	uint8 bMoreResistantToDamage : 1;
+	uint8 bTankDetonateCars : 1;
 	int16 field_4E0;
 	uint16 m_hydraulicState;
 	uint32 m_nBusDoorTimerEnd;
@@ -178,6 +179,8 @@ public:
 	void SetBumperDamage(int32 component, ePanels panel, bool noFlyingComponents = false);
 	void SetDoorDamage(int32 component, eDoors door, bool noFlyingComponents = false);
 
+	void TellHeliToGoToCoors(float x, float y, float z, uint8 speed);
+
 	void Fix(void);
 	void SetComponentVisibility(RwFrame *frame, uint32 flags);
 	void SetupModelNodes(void);
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index a4c6f3f3..55f0dd1c 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -29,6 +29,7 @@ bool CVehicle::bCheat5;
 bool CVehicle::bAltDodoCheat;
 #endif
 bool CVehicle::m_bDisableMouseSteering = true;
+bool CVehicle::bDisableRemoteDetonation;
 
 void *CVehicle::operator new(size_t sz) { return CPools::GetVehiclePool()->New();  }
 void *CVehicle::operator new(size_t sz, int handle) { return CPools::GetVehiclePool()->New(handle); }
@@ -1080,14 +1081,14 @@ CVehicle::SetDriver(CPed *driver)
 
 	if(bFreebies && driver == FindPlayerPed()){
 		if(GetModelIndex() == MI_AMBULAN)
-			FindPlayerPed()->m_fHealth = Min(FindPlayerPed()->m_fHealth + 20.0f, 100.0f);
+			FindPlayerPed()->m_fHealth = Min(FindPlayerPed()->m_fHealth + 20.0f, CWorld::Players[0].m_nMaxHealth);
 		else if(GetModelIndex() == MI_TAXI)
 			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 25;
 		else if (GetModelIndex() == MI_POLICE) {
 			CStreaming::RequestModel(WEAPONTYPE_SHOTGUN, STREAMFLAGS_DONT_REMOVE);
 			driver->GiveWeapon(WEAPONTYPE_SHOTGUN, 5);
 		} else if (GetModelIndex() == MI_ENFORCER)
-			driver->m_fArmour = Max(driver->m_fArmour, 100.0f);
+			driver->m_fArmour = Max(driver->m_fArmour, CWorld::Players[0].m_nMaxArmour);
 		else if(GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_ZEBRA)	// TODO(MIAMI): check zebra
 			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 25;
 		bFreebies = false;
@@ -1353,14 +1354,14 @@ eVehicleAppearance
 CVehicle::GetVehicleAppearance(void)
 {
 	if (IsCar())
-		return VEHICLE_CAR;
+		return VEHICLE_APPEARANCE_CAR;
 	if (IsBoat())
-		return VEHICLE_BOAT;
+		return VEHICLE_APPEARANCE_BOAT;
 	if (IsBike())
-		return VEHICLE_BIKE;
+		return VEHICLE_APPEARANCE_BIKE;
 	if (IsPlane())
-		return VEHICLE_PLANE;
+		return VEHICLE_APPEARANCE_PLANE;
 	if (IsHeli())
-		return VEHICLE_HELI;
-	return VEHICLE_NONE;
+		return VEHICLE_APPEARANCE_HELI;
+	return VEHICLE_APPEARANCE_NONE;
 }
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 666a26a2..5ec20c43 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -112,12 +112,12 @@ enum eFlightModel
 
 enum eVehicleAppearance
 {
-	VEHICLE_NONE,
-	VEHICLE_CAR,
-	VEHICLE_BIKE,
-	VEHICLE_HELI,
-	VEHICLE_BOAT,
-	VEHICLE_PLANE,
+	VEHICLE_APPEARANCE_NONE,
+	VEHICLE_APPEARANCE_CAR,
+	VEHICLE_APPEARANCE_BIKE,
+	VEHICLE_APPEARANCE_HELI,
+	VEHICLE_APPEARANCE_BOAT,
+	VEHICLE_APPEARANCE_PLANE,
 };
 
 // Or Weapon.h?
@@ -310,6 +310,7 @@ public:
 	static bool bAltDodoCheat;
 #endif
 	static bool m_bDisableMouseSteering;
+	static bool bDisableRemoteDetonation;
 };
 
 void DestroyVehicleAndDriverAndPassengers(CVehicle* pVehicle);