6 files changed, 59 insertions, 108 deletions

diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index a946bacb..028cd9cd 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -2193,8 +2193,7 @@ CAutomobile::PreRender(void)
 
 	case MI_TAXI:
 	case MI_CABBIE:
-	case MI_ZEBRA:
-	case MI_KAUFMAN:
+	case MI_BORGNINE:
 		if(bTaxiLight){
 			CVector pos = GetPosition() + GetUp()*0.95f;
 			CCoronas::RegisterCorona((uintptr)this + 21,
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp
index 8433a0ba..ffcb80d0 100644
--- a/src/vehicles/Cranes.cpp
+++ b/src/vehicles/Cranes.cpp
@@ -62,6 +62,7 @@ void CCranes::InitCranes(void)
 			}
 		}
 	}
+/*	// TODO(LCS)
 	for (CPtrNode* pNode = CWorld::GetBigBuildingList(LEVEL_MAINLAND).first; pNode; pNode = pNode->next) {
 		CEntity* pEntity = (CEntity*)pNode->item;
 		if (MODELID_CRANE_1 == pEntity->GetModelIndex() ||
@@ -72,6 +73,7 @@ void CCranes::InitCranes(void)
 			MODELID_CRANE_6 == pEntity->GetModelIndex())
 			AddThisOneCrane(pEntity);
 	}
+*/
 }
 
 void CCranes::AddThisOneCrane(CEntity* pEntity)
diff --git a/src/vehicles/HandlingMgr.cpp b/src/vehicles/HandlingMgr.cpp
index 611ddcc9..040b6972 100644
--- a/src/vehicles/HandlingMgr.cpp
+++ b/src/vehicles/HandlingMgr.cpp
@@ -44,6 +44,7 @@ const char VehicleNames[NUMHANDLINGS][14] = {
 	"RHINO",
 	"BARRACKS",
 	"TRAIN",
+	"FERRY",
 	"HELI",
 	"DODO",
 	"COACH",
@@ -56,66 +57,40 @@ const char VehicleNames[NUMHANDLINGS][14] = {
 	"DEADDODO",
 	"FLATBED",
 	"YANKEE",
-	"GOLFCART",
-	"VOODOO",
-	"WASHING",
-	"CUBAN",
-	"ROMERO",
-	"PACKER",
-	"ADMIRAL",
-	"GANGBUR",
-	"ZEBRA",
-	"TOPFUN",
-	"GLENDALE",
-	"OCEANIC",
-	"HERMES",
-	"SABRE1",
-	"SABRETUR",
-	"PHEONIX",
-	"WALTON",
-	"REGINA",
-	"COMET",
-	"DELUXO",
-	"BURRITO",
-	"SPAND",
-	"BAGGAGE",
-	"KAUFMAN",
-	"RANCHER",
-	"FBIRANCH",
-	"VIRGO",
-	"GREENWOO",
-	"HOTRING",
-	"SANDKING",
-	"BLISTAC",
-	"BOXVILLE",
-	"BENSON",
-	"DESPERAD",
-	"LOVEFIST",
-	"BLOODRA",
-	"BLOODRB",
+	"BLISTA",
+	"BELLYUP",
+	"MRWONGS",
+	"YARDIE",
+	"YAKUZA",
+	"DIABLOS",
+	"COLUMB",
+	"HOODS",
+	"PANLANT",
+	"BORGNINE",
+	"CAMPVAN",
+	"BALLOT",
+	"SPIDER",
+	"SHELBY",
+	"PONTIAC",
+	"ESPRIT",
+	"MINI",
+	"HOTROD",
+	"SINDACCO",
+	"FORELLI",
 	"BIKE",
 	"MOPED",
 	"DIRTBIKE",
 	"ANGEL",
+	"DIRTBIK2",
+	"ANGE2",
 	"FREEWAY",
 	"PREDATOR",
 	"SPEEDER",
 	"REEFER",
-	"RIO",
-	"SQUALO",
-	"TROPIC",
-	"COASTGRD",
-	"DINGHY",
-	"MARQUIS",
-	"CUPBOAT",
-	"SEAPLANE",
-	"SPARROW",
-	"SEASPAR",
 	"MAVERICK",
 	"COASTMAV",
 	"POLMAV",
 	"HUNTER",
-	"RCBARON",
 	"RCGOBLIN",
 	"RCCOPTER"
 };
@@ -350,7 +325,7 @@ void
 cHandlingDataMgr::ConvertDataToGameUnits(tHandlingData *handling)
 {
 	// convert distance to m, time to 1/50s
-	float velocity, a, b, specificVolume;
+	float velocity, a, b;
 
 	handling->Transmission.fEngineAcceleration *= 1.0f/(50.0f*50.0f);
 	handling->Transmission.fMaxVelocity *= 1000.0f/(60.0f*60.0f * 50.0f);
@@ -422,15 +397,15 @@ cHandlingDataMgr::GetHandlingId(const char *name)
 tFlyingHandlingData*
 cHandlingDataMgr::GetFlyingPointer(uint8 id)
 {
-	if(id >= HANDLING_SEAPLANE && id <= HANDLING_RCCOPTER)
-		return &FlyingHandlingData[id-HANDLING_SEAPLANE];
+	if(id >= HANDLING_MAVERICK && id <= HANDLING_RCCOPTER)
+		return &FlyingHandlingData[id-HANDLING_MAVERICK];
 	return &FlyingHandlingData[0];
 }
 
 tBoatHandlingData*
 cHandlingDataMgr::GetBoatPointer(uint8 id)
 {
-	if(id >= HANDLING_PREDATOR && id <= HANDLING_SEAPLANE)
+	if(id >= HANDLING_PREDATOR && id <= HANDLING_MAVERICK)
 		return &BoatHandlingData[id-HANDLING_PREDATOR];
 	return &BoatHandlingData[0];
 }
diff --git a/src/vehicles/HandlingMgr.h b/src/vehicles/HandlingMgr.h
index 446395f2..e6b5236f 100644
--- a/src/vehicles/HandlingMgr.h
+++ b/src/vehicles/HandlingMgr.h
@@ -36,6 +36,7 @@ enum tVehicleType
 	HANDLING_RHINO,
 	HANDLING_BARRACKS,
 	HANDLING_TRAIN,
+	HANDLING_FERRY,
 	HANDLING_HELI,
 	HANDLING_DODO,
 	HANDLING_COACH,
@@ -48,76 +49,51 @@ enum tVehicleType
 	HANDLING_DEADDODO,
 	HANDLING_FLATBED,
 	HANDLING_YANKEE,
-	HANDLING_GOLFCART,
-	HANDLING_VOODOO,
-	HANDLING_WASHING,
-	HANDLING_CUBAN,
-	HANDLING_ROMERO,
-	HANDLING_PACKER,
-	HANDLING_ADMIRAL,
-	HANDLING_GANGBUR,
-	HANDLING_ZEBRA,
-	HANDLING_TOPFUN,
-	HANDLING_GLENDALE,
-	HANDLING_OCEANIC,
-	HANDLING_HERMES,
-	HANDLING_SABRE1,
-	HANDLING_SABRETUR,
-	HANDLING_PHEONIX,
-	HANDLING_WALTON,
-	HANDLING_REGINA,
-	HANDLING_COMET,
-	HANDLING_DELUXO,
-	HANDLING_BURRITO,
-	HANDLING_SPAND,
-	HANDLING_BAGGAGE,
-	HANDLING_KAUFMAN,
-	HANDLING_RANCHER,
-	HANDLING_FBIRANCH,
-	HANDLING_VIRGO,
-	HANDLING_GREENWOO,
-	HANDLING_HOTRING,
-	HANDLING_SANDKING,
-	HANDLING_BLISTAC,
-	HANDLING_BOXVILLE,
-	HANDLING_BENSON,
-	HANDLING_DESPERAD,
-	HANDLING_LOVEFIST,
-	HANDLING_BLOODRA,
-	HANDLING_BLOODRB,
+	HANDLING_BLISTA,
+	HANDLING_BELLYUP,
+	HANDLING_MRWONGS,
+	HANDLING_YARDIE,
+	HANDLING_YAKUZA,
+	HANDLING_DIABLOS,
+	HANDLING_COLUMB,
+	HANDLING_HOODS,
+	HANDLING_PANLANT,
+	HANDLING_BORGNINE,
+	HANDLING_CAMPVAN,
+	HANDLING_BALLOT,
+	HANDLING_SPIDER,
+	HANDLING_SHELBY,
+	HANDLING_PONTIAC,
+	HANDLING_ESPRIT,
+	HANDLING_MINI,
+	HANDLING_HOTROD,
+	HANDLING_SINDACCO,
+	HANDLING_FORELLI,
 
 	HANDLING_BIKE,
 	HANDLING_MOPED,
 	HANDLING_DIRTBIKE,
 	HANDLING_ANGEL,
+	HANDLING_DIRTBIK2,
+	HANDLING_ANGE2,
 	HANDLING_FREEWAY,
 
 	HANDLING_PREDATOR,
 	HANDLING_SPEEDER,
 	HANDLING_REEFER,
-	HANDLING_RIO,
-	HANDLING_SQUALO,
-	HANDLING_TROPIC,
-	HANDLING_COASTGRD,
-	HANDLING_DINGHY,
-	HANDLING_MARQUIS,
-	HANDLING_CUPBOAT,
-	HANDLING_SEAPLANE,	// both boat and plane!
-	HANDLING_SPARROW,
-	HANDLING_SEASPAR,
+
 	HANDLING_MAVERICK,
 	HANDLING_COASTMAV,
 	HANDLING_POLMAV,
 	HANDLING_HUNTER,
-	HANDLING_RCBARON,
 	HANDLING_RCGOBLIN,
 	HANDLING_RCCOPTER,
 
 	NUMHANDLINGS,
 
 	NUMBIKEHANDLINGS = HANDLING_FREEWAY+1 - HANDLING_BIKE,
-	NUMFLYINGHANDLINGS = HANDLING_RCCOPTER+1 - HANDLING_SEAPLANE,
-	NUMBOATHANDLINGS = HANDLING_SEAPLANE+1 - HANDLING_PREDATOR,
+	NUMFLYINGHANDLINGS = HANDLING_RCCOPTER+1 - HANDLING_MAVERICK,
+	NUMBOATHANDLINGS = HANDLING_COASTMAV+1 - HANDLING_PREDATOR,
 };
 
 enum tField // most likely a handling field enum, never used so :shrug:
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 1849fd7f..c2bca63e 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -1841,8 +1841,7 @@ CVehicle::SetDriver(CPed *driver)
 
 		case MI_TAXI:
 		case MI_CABBIE:
-		case MI_ZEBRA:
-		case MI_KAUFMAN:
+		case MI_BORGNINE:
 			CWorld::Players[CWorld::PlayerInFocus].m_nMoney += 12;
 			break;
 
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index 7388bfab..795161bf 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -384,8 +384,8 @@ public:
 
 	bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1 && GetStatus() != STATUS_WRECKED; }
 	CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); }
-	bool IsTaxi(void) { return GetModelIndex() == MI_TAXI || GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_ZEBRA || GetModelIndex() == MI_KAUFMAN; }
-	bool IsLimo(void) { return GetModelIndex() == MI_STRETCH || GetModelIndex() == MI_LOVEFIST; }
+	bool IsTaxi(void) { return GetModelIndex() == MI_TAXI || GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_BORGNINE; }
+	bool IsLimo(void) { return GetModelIndex() == MI_STRETCH; }
 	bool IsRealHeli(void) { return !!(pHandling->Flags & HANDLING_IS_HELI); }
 	bool IsRealPlane(void) { return !!(pHandling->Flags & HANDLING_IS_PLANE); }