(svn r9302) -Codechange: Use cargo class to test for passengers when deciding on the livery scheme to use.
--- a/src/vehicle.cpp Sun Mar 18 22:07:44 2007 +0000
+++ b/src/vehicle.cpp Sun Mar 18 22:11:24 2007 +0000
@@ -2508,14 +2508,14 @@
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;
}