miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.8.0

Browse Source 
--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2018-04-06 21:26:22 +03:00
parent c13f57641c
commit 42ec3bd611
221 changed files with 2325 additions and 1788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vehicle_gui.cpp
View File

@@ -1,4 +1,4 @@
/* $Id: vehicle_gui.cpp 27939 2017-12-11 19:20:44Z frosch $ */
/* $Id: vehicle_gui.cpp 27895 2017-08-20 08:28:05Z alberth $ */
/*
* This file is part of OpenTTD.
@@ -817,8 +817,8 @@ struct RefitWindow : public Window {
Vehicle *v = Vehicle::Get(this->window_number);
this->selected_vehicle = v->index;
this->num_vehicles = UINT8_MAX;
/* FALL THROUGH */
}
FALLTHROUGH;
case 2: { // The vehicle selection has changed; rebuild the entire list.
if (!gui_scope) break;
@@ -843,8 +843,8 @@ struct RefitWindow : public Window {
this->information_width = max_width;
this->ReInit();
}
/* FALL THROUGH */
}
FALLTHROUGH;
case 1: // A new cargo has been selected.
if (!gui_scope) break;
@@ -905,8 +905,8 @@ struct RefitWindow : public Window {
if (_ctrl_pressed) this->num_vehicles = UINT8_MAX;
break;
}
/* FALL THROUGH */
}
FALLTHROUGH;
default:
/* Clear the selection. */
@@ -940,8 +940,8 @@ struct RefitWindow : public Window {
this->InvalidateData(1);
if (click_count == 1) break;
/* FALL THROUGH */
}
FALLTHROUGH;
case WID_VR_REFIT: // refit button
if (this->cargo != NULL) {
@@ -2069,9 +2069,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;
}
@@ -2633,8 +2638,7 @@ public:
str = STR_VEHICLE_STATUS_LEAVING;
break;
}
/* FALL THROUGH, if aircraft. Does this even happen? */
FALLTHROUGH;
default:
if (v->GetNumManualOrders() == 0) {
str = STR_VEHICLE_STATUS_NO_ORDERS_VEL;