dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r17926) -Fix (r9352): Make the decision whether aircraft carry mail consistent. Now always the cargo class decides.

Browse Source
This commit is contained in:
frosch
2009-10-31 17:48:09 +00:00
parent 651e176193
commit 9fafef56d0
8 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/engine_gui.cpp
View File

@@ -158,21 +158,23 @@ static StringID GetTrainEngineInfoString(const Engine *e)
static StringID GetAircraftEngineInfoString(const Engine *e)
{
CargoID cargo = e->GetDefaultCargoType();
uint16 mail_capacity;
uint capacity = e->GetDisplayDefaultCapacity(&mail_capacity);
if (cargo == CT_INVALID || cargo == CT_PASSENGERS) {
if (mail_capacity > 0) {
SetDParam(0, e->GetCost());
SetDParam(1, e->GetDisplayMaxSpeed());
SetDParam(2, CT_PASSENGERS),
SetDParam(3, e->GetDisplayDefaultCapacity());
SetDParam(4, CT_MAIL),
SetDParam(5, e->u.air.mail_capacity);
SetDParam(2, cargo);
SetDParam(3, capacity);
SetDParam(4, CT_MAIL);
SetDParam(5, mail_capacity);
SetDParam(6, e->GetRunningCost());
return STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST;
} else {
SetDParam(0, e->GetCost());
SetDParam(1, e->GetDisplayMaxSpeed());
SetDParam(2, cargo);
SetDParam(3, e->GetDisplayDefaultCapacity());
SetDParam(3, capacity);
SetDParam(4, e->GetRunningCost());
return STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST;
}