summaryrefslogtreecommitdiff
path: root/src/vehicle_gui.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-02-04 14:37:24 +0000
committerrubidium <rubidium@openttd.org>2011-02-04 14:37:24 +0000
commit2ad1279725c08c98db9eaaceb684709f59a6650f (patch)
tree53f916efc3dc42e7e1badddfdbd26c1f75c4365a /src/vehicle_gui.cpp
parent3057a26fd5e2cffe9afc6ed5034dcd2c61fb2c6e (diff)
downloadopenttd-2ad1279725c08c98db9eaaceb684709f59a6650f.tar.xz
(svn r21954) -Cleanup: remove setting to not show the vehicle speed in the vehicle view
Diffstat (limited to 'src/vehicle_gui.cpp')
-rw-r--r--src/vehicle_gui.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index a6197c608..eaa88674c 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -2404,7 +2404,7 @@ public:
}
} else {
SetDParam(0, v->GetDisplaySpeed());
- str = STR_VEHICLE_STATUS_TRAIN_STOPPING + _settings_client.gui.vehicle_speed;
+ str = STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL;
}
} else { // no train
str = STR_VEHICLE_STATUS_STOPPED;
@@ -2416,7 +2416,7 @@ public:
case OT_GOTO_STATION: {
SetDParam(0, v->current_order.GetDestination());
SetDParam(1, v->GetDisplaySpeed());
- str = STR_VEHICLE_STATUS_HEADING_FOR_STATION + _settings_client.gui.vehicle_speed;
+ str = STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL;
break;
}
@@ -2425,9 +2425,9 @@ public:
SetDParam(1, v->current_order.GetDestination());
SetDParam(2, v->GetDisplaySpeed());
if (v->current_order.GetDepotActionType() & ODATFB_HALT) {
- str = STR_VEHICLE_STATUS_HEADING_FOR_DEPOT + _settings_client.gui.vehicle_speed;
+ str = STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_VEL;
} else {
- str = STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE + _settings_client.gui.vehicle_speed;
+ str = STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE_VEL;
}
break;
}
@@ -2439,7 +2439,7 @@ public:
case OT_GOTO_WAYPOINT: {
assert(v->type == VEH_TRAIN || v->type == VEH_SHIP);
SetDParam(0, v->current_order.GetDestination());
- str = STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT + _settings_client.gui.vehicle_speed;
+ str = STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL;
SetDParam(1, v->GetDisplaySpeed());
break;
}
@@ -2453,7 +2453,7 @@ public:
default:
if (v->GetNumManualOrders() == 0) {
- str = STR_VEHICLE_STATUS_NO_ORDERS + _settings_client.gui.vehicle_speed;
+ str = STR_VEHICLE_STATUS_NO_ORDERS_VEL;
SetDParam(0, v->GetDisplaySpeed());
} else {
str = STR_EMPTY;