diff options
| author | peter1138 <peter1138@openttd.org> | 2007-03-18 22:11:24 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2007-03-18 22:11:24 +0000 |
| commit | fa206387ad5b2b8e4eb0efa21fcbe8be1e58c430 (patch) | |
| tree | 9f739a5459bdb64f7c22ed3403c6418474b3cb93 | |
| parent | 497e5fe565a7092b21e4c8c5ca3ab6cdcf07c822 (diff) | |
| download | openttd-fa206387ad5b2b8e4eb0efa21fcbe8be1e58c430.tar.xz | |
(svn r9302) -Codechange: Use cargo class to test for passengers when deciding on the livery scheme to use.
| -rw-r--r-- | src/vehicle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 79f12dfea..3ab08b31a 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; } |