diff options
author | smatz <smatz@openttd.org> | 2010-06-11 00:18:28 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2010-06-11 00:18:28 +0000 |
commit | c4175b752a11b3b8c0c2d6b6677493f942b11fb8 (patch) | |
tree | baf7ed0749d967050706ed43dd709c99ea4d93fc /src/vehicle_gui.cpp | |
parent | 8bf4a7d1ae5643b20d842f7fe9637e453614b8aa (diff) | |
download | openttd-c4175b752a11b3b8c0c2d6b6677493f942b11fb8.tar.xz |
(svn r19957) -Codechange: remove VLW_WAYPOINT_LIST
Diffstat (limited to 'src/vehicle_gui.cpp')
-rw-r--r-- | src/vehicle_gui.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index b50115726..f56c2f01e 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -43,6 +43,7 @@ #include "engine_base.h" #include "engine_func.h" #include "newgrf.h" +#include "station_base.h" #include "table/sprites.h" #include "table/strings.h" @@ -1076,14 +1077,8 @@ public: SetDParam(3, this->vscroll.GetCount()); break; - case VLW_WAYPOINT_LIST: - SetDParam(0, STR_WAYPOINT_NAME); - SetDParam(1, index); - SetDParam(3, this->vscroll.GetCount()); - break; - - case VLW_STATION_LIST: // Station Name - SetDParam(0, STR_STATION_NAME); + case VLW_STATION_LIST: // Station/Waypoint Name + SetDParam(0, Station::IsExpected(BaseStation::Get(index)) ? STR_STATION_NAME : STR_WAYPOINT_NAME); SetDParam(1, index); SetDParam(3, this->vscroll.GetCount()); break; @@ -1303,12 +1298,6 @@ void ShowVehicleListWindow(CompanyID company, VehicleType vehicle_type) } } -void ShowVehicleListWindow(CompanyID company, VehicleType vehicle_type, const Waypoint *wp) -{ - if (wp == NULL) return; - ShowVehicleListWindowLocal(company, VLW_WAYPOINT_LIST, vehicle_type, wp->index); -} - void ShowVehicleListWindow(const Vehicle *v) { ShowVehicleListWindowLocal(v->owner, VLW_SHARED_ORDERS, v->type, v->FirstShared()->index); |