From 8ef0e43b940e216fff47b6914a79bc1d8c290fc3 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 18 Mar 2007 22:11:24 +0000 Subject: [PATCH] (svn r9302) -Codechange: Use cargo class to test for passengers when deciding on the livery scheme to use. --- src/vehicle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 79f12dfea8..3ab08b31a4 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2508,14 +2508,14 @@ static SpriteID GetEngineColourMap(EngineID engine_type, PlayerID player, Engine case VEH_ROAD: { const RoadVehicleInfo *rvi = RoadVehInfo(engine_type); if (cargo_type == CT_INVALID) cargo_type = rvi->cargo_type; - scheme = (cargo_type == CT_PASSENGERS) ? LS_BUS : LS_TRUCK; + scheme = IsCargoInClass(cargo_type, CC_PASSENGERS) ? LS_BUS : LS_TRUCK; break; } case VEH_SHIP: { const ShipVehicleInfo *svi = ShipVehInfo(engine_type); if (cargo_type == CT_INVALID) cargo_type = svi->cargo_type; - scheme = (cargo_type == CT_PASSENGERS) ? LS_PASSENGER_SHIP : LS_FREIGHT_SHIP; + scheme = IsCargoInClass(cargo_type, CC_PASSENGERS) ? LS_PASSENGER_SHIP : LS_FREIGHT_SHIP; break; }