diff options
author | frosch <frosch@openttd.org> | 2009-03-18 19:32:13 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2009-03-18 19:32:13 +0000 |
commit | 6dd04a9a7804e0d4cecb74dc88dab1fd8c8382a6 (patch) | |
tree | 5b3edf89230e9a4cf637194daab09e36914f83e4 /src/articulated_vehicles.cpp | |
parent | ea2c50281e34c8c0ade102552fc3d0f336496de9 (diff) | |
download | openttd-6dd04a9a7804e0d4cecb74dc88dab1fd8c8382a6.tar.xz |
(svn r15763) -Codechange/Fix: Add Engine::GetDisplayDefaultCapacity() and use it everywhere, so CB 36 is also used everywhere.
Diffstat (limited to 'src/articulated_vehicles.cpp')
-rw-r--r-- | src/articulated_vehicles.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp index 2a6fb6b2c..fd710795b 100644 --- a/src/articulated_vehicles.cpp +++ b/src/articulated_vehicles.cpp @@ -5,7 +5,6 @@ #include "stdafx.h" #include "train.h" #include "roadveh.h" -#include "aircraft.h" #include "newgrf_engine.h" #include "vehicle_func.h" @@ -52,22 +51,7 @@ static inline uint16 GetVehicleDefaultCapacity(EngineID engine, VehicleType type CargoID cargo = (e->CanCarryCargo() ? e->GetDefaultCargoType() : (CargoID)CT_INVALID); if (cargo_type != NULL) *cargo_type = cargo; if (cargo == CT_INVALID) return 0; - switch (type) { - case VEH_TRAIN: - return GetEngineProperty(engine, 0x14, e->u.rail.capacity) + (e->u.rail.railveh_type == RAILVEH_MULTIHEAD ? e->u.rail.capacity : 0); - - case VEH_ROAD: - return GetEngineProperty(engine, 0x0F, e->u.road.capacity); - - case VEH_SHIP: - return GetEngineProperty(engine, 0x0D, e->u.ship.capacity); - - case VEH_AIRCRAFT: - return AircraftDefaultCargoCapacity(cargo, &e->u.air); - - default: NOT_REACHED(); - } - + return e->GetDisplayDefaultCapacity(); } /** |