diff options
author | frosch <frosch@openttd.org> | 2011-11-09 16:38:50 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2011-11-09 16:38:50 +0000 |
commit | 026317bb444c1165ba96904f8e5a300b1a657539 (patch) | |
tree | 103adbbc8acf8129b9b1d030304950f06d9a6a8b /src/vehicle.cpp | |
parent | e4011426f2a4ae1ccbbced0cc45d22bce2502fe9 (diff) | |
download | openttd-026317bb444c1165ba96904f8e5a300b1a657539.tar.xz |
(svn r23173) -Codechange: Rename GetVehicleCapacity() to Engine::DetermineCapacity().
Diffstat (limited to 'src/vehicle.cpp')
-rw-r--r-- | src/vehicle.cpp | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index b181038bd..dd7186fc6 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1794,71 +1794,6 @@ PaletteID GetVehiclePalette(const Vehicle *v) } /** - * Determines capacity of a given vehicle from scratch. - * For aircraft the main capacity is determined. Mail might be present as well. - * @note Keep this function consistent with Engine::GetDisplayDefaultCapacity(). - * @param v Vehicle of interest - * @param mail_capacity returns secondary cargo (mail) capacity of aircraft - * @return Capacity - */ -uint GetVehicleCapacity(const Vehicle *v, uint16 *mail_capacity) -{ - if (mail_capacity != NULL) *mail_capacity = 0; - const Engine *e = v->GetEngine(); - - if (!e->CanCarryCargo()) return 0; - - if (mail_capacity != NULL && e->type == VEH_AIRCRAFT && IsCargoInClass(v->cargo_type, CC_PASSENGERS)) { - *mail_capacity = GetVehicleProperty(v, PROP_AIRCRAFT_MAIL_CAPACITY, e->u.air.mail_capacity); - } - CargoID default_cargo = e->GetDefaultCargoType(); - - /* Check the refit capacity callback if we are not in the default configuration. - * Note: This might change to become more consistent/flexible/sane, esp. when default cargo is first refittable. */ - if (HasBit(e->info.callback_mask, CBM_VEHICLE_REFIT_CAPACITY) && - (default_cargo != v->cargo_type || v->cargo_subtype != 0)) { - uint16 callback = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v); - if (callback != CALLBACK_FAILED) return callback; - } - - /* 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 = GetVehicleProperty(v, PROP_AIRCRAFT_PASSENGER_CAPACITY, e->u.air.passenger_capacity); break; - default: NOT_REACHED(); - } - - /* Apply multipliers depending on cargo- and vehicletype. - * Note: This might change to become more consistent/flexible. */ - if (e->type != VEH_SHIP) { - if (e->type == VEH_AIRCRAFT) { - if (!IsCargoInClass(v->cargo_type, CC_PASSENGERS)) { - capacity += GetVehicleProperty(v, PROP_AIRCRAFT_MAIL_CAPACITY, e->u.air.mail_capacity); - } - if (v->cargo_type == CT_MAIL) return capacity; - } else { - switch (default_cargo) { - case CT_PASSENGERS: break; - case CT_MAIL: - case CT_GOODS: capacity *= 2; break; - default: capacity *= 4; break; - } - } - switch (v->cargo_type) { - case CT_PASSENGERS: break; - case CT_MAIL: - case CT_GOODS: capacity /= 2; break; - default: capacity /= 4; break; - } - } - - return capacity; -} - -/** * Delete all implicit orders which were not reached. */ void Vehicle::DeleteUnreachedImplicitOrders() |