3 files changed, 7 insertions, 5 deletions

diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index d528ecca..ddb75d84 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -61,8 +61,8 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
 	m_fFireBlowUpTimer = 0.0f;
 	field_4E0 = 0;
 	bTaxiLight = m_sAllTaxiLights;
-	m_auto_flagA20 = false;
-	m_auto_flagA40 = false;
+	bFixedColour = false;
+	bBigWheels = false;
 	bWaterTight = false;
 
 	SetModelIndex(id);
@@ -1090,7 +1090,7 @@ CAutomobile::ProcessControl(void)
 
 
 	if(m_bSirenOrAlarm && (CTimer::GetFrameCounter()&7) == 5 &&
-	   UsesSiren(GetModelIndex()) && GetModelIndex() != MI_RCBANDIT)
+	   UsesSiren(GetModelIndex()) && GetModelIndex() != MI_MRWHOOP)
 		CCarAI::MakeWayForCarWithSiren(this);
 
 
diff --git a/src/vehicles/Automobile.h b/src/vehicles/Automobile.h
index 534f28a4..561ab566 100644
--- a/src/vehicles/Automobile.h
+++ b/src/vehicles/Automobile.h
@@ -87,8 +87,8 @@ public:
 	uint8 m_bombType : 3;
 	uint8 bTaxiLight : 1;
 	uint8 bHadDriver : 1;		// for bombs
-	uint8 m_auto_flagA20 : 1;
-	uint8 m_auto_flagA40 : 1;
+	uint8 bFixedColour : 1;
+	uint8 bBigWheels : 1;
 	uint8 bWaterTight : 1;	// no damage for non-player peds
 	uint8 bNotDamagedUpsideDown : 1;
 	uint8 bMoreResistantToDamage : 1;
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 2399e631..7e99258c 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -2,6 +2,7 @@
 
 #include "Physical.h"
 #include "AutoPilot.h"
+#include "ModelIndices.h"
 
 class CPed;
 class CFire;
@@ -267,6 +268,7 @@ public:
 
 	bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; }
 	CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); }
+	bool IsTaxi(void) { return GetModelIndex() == MI_TAXI || GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_BORGNINE; }
 	
 	static bool &bWheelsOnlyCheat;
 	static bool &bAllDodosCheat;