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 | c297a99efffd370e3c66c29a05f213ba38e81334 (patch) | |
tree | 5b3edf89230e9a4cf637194daab09e36914f83e4 /src/engine_gui.cpp | |
parent | 6d9b2ac76a321ee48c03ca8faf165eb504a50336 (diff) | |
download | openttd-c297a99efffd370e3c66c29a05f213ba38e81334.tar.xz |
(svn r15763) -Codechange/Fix: Add Engine::GetDisplayDefaultCapacity() and use it everywhere, so CB 36 is also used everywhere.
Diffstat (limited to 'src/engine_gui.cpp')
-rw-r--r-- | src/engine_gui.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp index 94f2b4452..2a5d0f1d5 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -14,7 +14,6 @@ #include "engine_gui.h" #include "articulated_vehicles.h" #include "rail.h" -#include "aircraft.h" #include "table/strings.h" #include "table/sprites.h" @@ -151,7 +150,7 @@ static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw) if (cargo == CT_INVALID || cargo == CT_PASSENGERS) { SetDParam(0, e->GetCost()); SetDParam(1, e->GetDisplayMaxSpeed()); - SetDParam(2, e->u.air.passenger_capacity); + SetDParam(2, e->GetDisplayDefaultCapacity()); SetDParam(3, e->u.air.mail_capacity); SetDParam(4, e->GetRunningCost()); @@ -160,7 +159,7 @@ static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw) SetDParam(0, e->GetCost()); SetDParam(1, e->GetDisplayMaxSpeed()); SetDParam(2, cargo); - SetDParam(3, AircraftDefaultCargoCapacity(cargo, &e->u.air)); + SetDParam(3, e->GetDisplayDefaultCapacity()); SetDParam(4, e->GetRunningCost()); DrawStringMultiCenter(x, y, STR_982E_COST_MAX_SPEED_CAPACITY, maxw); @@ -187,13 +186,12 @@ static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw) static void DrawShipEngineInfo(EngineID engine, int x, int y, int maxw) { - const ShipVehicleInfo *svi = ShipVehInfo(engine); const Engine *e = GetEngine(engine); SetDParam(0, e->GetCost()); SetDParam(1, e->GetDisplayMaxSpeed()); SetDParam(2, e->GetDefaultCargoType()); - SetDParam(3, GetEngineProperty(engine, 0x0D, svi->capacity)); + SetDParam(3, e->GetDisplayDefaultCapacity()); SetDParam(4, e->GetRunningCost()); DrawStringMultiCenter(x, y, STR_982E_COST_MAX_SPEED_CAPACITY, maxw); } |