diff options
| author | bjarni <bjarni@openttd.org> | 2007-01-21 00:01:47 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2007-01-21 00:01:47 +0000 |
| commit | c8c27b974058e5c6673ed7a7d0bdd2eb623d4295 (patch) | |
| tree | 8c1a71e7972a3d2f2e3847db25fc4cf7a81aca7f /src/main_gui.cpp | |
| parent | 470619a8bb960501bf54d82cb3a1c2a9f7006768 (diff) | |
| download | openttd-c8c27b974058e5c6673ed7a7d0bdd2eb623d4295.tar.xz | |
(svn r8293) -Codechange: overloaded ShowVehicleListWindow() so it can open all types of vehicle lists (depending on arguments)
- Also removed some unneeded arguments
- this also allows removing an if-else cascade in ShowVehicleListWindowLocal()
Diffstat (limited to 'src/main_gui.cpp')
| -rw-r--r-- | src/main_gui.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp index e88a306c5..38c269c0d 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -263,22 +263,22 @@ static void MenuClickIndustry(int index) static void MenuClickShowTrains(int index) { - ShowVehicleListWindow((PlayerID)index, INVALID_STATION, VEH_Train); + ShowVehicleListWindow((PlayerID)index, VEH_Train); } static void MenuClickShowRoad(int index) { - ShowVehicleListWindow((PlayerID)index, INVALID_STATION, VEH_Road); + ShowVehicleListWindow((PlayerID)index, VEH_Road); } static void MenuClickShowShips(int index) { - ShowVehicleListWindow((PlayerID)index, INVALID_STATION, VEH_Ship); + ShowVehicleListWindow((PlayerID)index, VEH_Ship); } static void MenuClickShowAir(int index) { - ShowVehicleListWindow((PlayerID)index, INVALID_STATION, VEH_Aircraft); + ShowVehicleListWindow((PlayerID)index, VEH_Aircraft); } static void MenuClickBuildRail(int index) @@ -1802,10 +1802,10 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e) case WKC_F10:ShowOperatingProfitGraph(); break; case WKC_F11: ShowCompanyLeagueTable(); break; case WKC_F12: ShowBuildIndustryWindow(); break; - case WKC_SHIFT | WKC_F1: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Train); break; - case WKC_SHIFT | WKC_F2: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Road); break; - case WKC_SHIFT | WKC_F3: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Ship); break; - case WKC_SHIFT | WKC_F4: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Aircraft); break; + case WKC_SHIFT | WKC_F1: ShowVehicleListWindow(_local_player, VEH_Train); break; + case WKC_SHIFT | WKC_F2: ShowVehicleListWindow(_local_player, VEH_Road); break; + case WKC_SHIFT | WKC_F3: ShowVehicleListWindow(_local_player, VEH_Ship); break; + case WKC_SHIFT | WKC_F4: ShowVehicleListWindow(_local_player, VEH_Aircraft); break; case WKC_SHIFT | WKC_F5: ToolbarZoomInClick(w); break; case WKC_SHIFT | WKC_F6: ToolbarZoomOutClick(w); break; case WKC_SHIFT | WKC_F7: ShowBuildRailToolbar(_last_built_railtype, -1); break; |