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

Merge branch 'save_ext' into improved_breakdowns

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-06-06 18:41:01 +01:00
parent 5ba666883b 843343fcf1
commit 44fa555c6d
211 changed files with 3067 additions and 2038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vehicle_gui.cpp
View File

@@ -2095,9 +2095,14 @@ struct VehicleDetailsWindow : Window {
}
} else {
SetDParam(0, v->GetDisplayMaxSpeed());
if (v->type == VEH_AIRCRAFT && Aircraft::From(v)->GetRange() > 0) {
SetDParam(1, Aircraft::From(v)->GetRange());
string = STR_VEHICLE_INFO_MAX_SPEED_RANGE;
if (v->type == VEH_AIRCRAFT) {
SetDParam(1, v->GetEngine()->GetAircraftTypeText());
if (Aircraft::From(v)->GetRange() > 0) {
SetDParam(2, Aircraft::From(v)->GetRange());
string = STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE;
} else {
string = STR_VEHICLE_INFO_MAX_SPEED_TYPE;
}
} else {
string = STR_VEHICLE_INFO_MAX_SPEED;
}
@@ -2501,6 +2506,7 @@ private:
public:
VehicleViewWindow(WindowDesc *desc, WindowNumber window_number) : Window(desc)
{
this->flags |= WF_DISABLE_VP_SCROLL;
this->CreateNestedTree();
/* Sprites for the 'send to depot' button indexed by vehicle type. */