diff options
| author | frosch <frosch@openttd.org> | 2010-02-22 21:46:20 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2010-02-22 21:46:20 +0000 |
| commit | 63b01f2009be96797bc3a08c6391516604e00e86 (patch) | |
| tree | caf3307a34205ae1043eb9d377336510b13cd400 /src/vehicle.cpp | |
| parent | fee0743ba99da6301ac6e9b0eda05b06e1c60a69 (diff) | |
| download | openttd-63b01f2009be96797bc3a08c6391516604e00e86.tar.xz | |
(svn r19218) -Feature: [NewGRF] Add CB36 support for aircraft properties 0F and 11. (Eddi)
Diffstat (limited to 'src/vehicle.cpp')
| -rw-r--r-- | src/vehicle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 4cf0af4d9..f0a1d40da 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1468,7 +1468,7 @@ uint GetVehicleCapacity(const Vehicle *v, uint16 *mail_capacity) if (!e->CanCarryCargo()) return 0; if (mail_capacity != NULL && e->type == VEH_AIRCRAFT && IsCargoInClass(v->cargo_type, CC_PASSENGERS)) { - *mail_capacity = e->u.air.mail_capacity; + *mail_capacity = GetVehicleProperty(v, PROP_AIRCRAFT_MAIL_CAPACITY, e->u.air.mail_capacity); } CargoID default_cargo = e->GetDefaultCargoType(); @@ -1483,10 +1483,10 @@ uint GetVehicleCapacity(const Vehicle *v, uint16 *mail_capacity) /* Get capacity according to property resp. CB */ uint capacity; switch (e->type) { - case VEH_TRAIN: capacity = GetVehicleProperty(v, PROP_TRAIN_CARGO_CAPACITY, e->u.rail.capacity); break; - case VEH_ROAD: capacity = GetVehicleProperty(v, PROP_ROADVEH_CARGO_CAPACITY, e->u.road.capacity); break; - case VEH_SHIP: capacity = GetVehicleProperty(v, PROP_SHIP_CARGO_CAPACITY, e->u.ship.capacity); break; - case VEH_AIRCRAFT: capacity = e->u.air.passenger_capacity; break; + case VEH_TRAIN: capacity = GetVehicleProperty(v, PROP_TRAIN_CARGO_CAPACITY, e->u.rail.capacity); break; + case VEH_ROAD: capacity = GetVehicleProperty(v, PROP_ROADVEH_CARGO_CAPACITY, e->u.road.capacity); break; + case VEH_SHIP: capacity = GetVehicleProperty(v, PROP_SHIP_CARGO_CAPACITY, e->u.ship.capacity); break; + case VEH_AIRCRAFT: capacity = GetVehicleProperty(v, PROP_AIRCRAFT_PASSENGER_CAPACITY, e->u.air.passenger_capacity); break; default: NOT_REACHED(); } @@ -1495,7 +1495,7 @@ uint GetVehicleCapacity(const Vehicle *v, uint16 *mail_capacity) if (e->type != VEH_SHIP) { if (e->type == VEH_AIRCRAFT) { if (!IsCargoInClass(v->cargo_type, CC_PASSENGERS)) { - capacity += e->u.air.mail_capacity; + capacity += GetVehicleProperty(v, PROP_AIRCRAFT_MAIL_CAPACITY, e->u.air.mail_capacity); } if (v->cargo_type == CT_MAIL) return capacity; } else { |