diff options
author | frosch <frosch@openttd.org> | 2009-03-13 23:49:12 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2009-03-13 23:49:12 +0000 |
commit | fa35dc10e5e2924f971e6787d74d3f229514960b (patch) | |
tree | daf417673f6b645f018e9c864b81143d176c5389 /src/engine_gui.cpp | |
parent | 40745dc0d95a25fbbbbd0f019e825d8b41f99f8e (diff) | |
download | openttd-fa35dc10e5e2924f971e6787d74d3f229514960b.tar.xz |
(svn r15705) -Fix: Do not show passenger-/mail-capacity if the aircraft carries only cargo.
Diffstat (limited to 'src/engine_gui.cpp')
-rw-r--r-- | src/engine_gui.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp index 84a344c82..b514df55d 100644 --- a/src/engine_gui.cpp +++ b/src/engine_gui.cpp @@ -14,6 +14,7 @@ #include "engine_gui.h" #include "articulated_vehicles.h" #include "rail.h" +#include "aircraft.h" #include "table/strings.h" #include "table/sprites.h" @@ -144,16 +145,26 @@ static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw) static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw) { - const AircraftVehicleInfo *avi = AircraftVehInfo(engine); const Engine *e = GetEngine(engine); + CargoID cargo = e->GetDefaultCargoType(); - SetDParam(0, e->GetCost()); - SetDParam(1, e->GetDisplayMaxSpeed()); - SetDParam(2, avi->passenger_capacity); - SetDParam(3, avi->mail_capacity); - SetDParam(4, e->GetRunningCost()); + if (cargo == CT_INVALID || cargo == CT_PASSENGERS) { + SetDParam(0, e->GetCost()); + SetDParam(1, e->GetDisplayMaxSpeed()); + SetDParam(2, e->u.air.passenger_capacity); + SetDParam(3, e->u.air.mail_capacity); + SetDParam(4, e->GetRunningCost()); - DrawStringMultiCenter(x, y, STR_A02E_COST_MAX_SPEED_CAPACITY, maxw); + DrawStringMultiCenter(x, y, STR_A02E_COST_MAX_SPEED_CAPACITY, maxw); + } else { + SetDParam(0, e->GetCost()); + SetDParam(1, e->GetDisplayMaxSpeed()); + SetDParam(2, cargo); + SetDParam(3, AircraftDefaultCargoCapacity(cargo, &e->u.air)); + SetDParam(4, e->GetRunningCost()); + + DrawStringMultiCenter(x, y, STR_982E_COST_MAX_SPEED_CAPACITY, maxw); + } } static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw) |