diff options
| author | rubidium <rubidium@openttd.org> | 2007-05-21 21:58:31 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-05-21 21:58:31 +0000 |
| commit | b7748a686eca83d53eddf0be888e6f58eb12d054 (patch) | |
| tree | e4d59448a2b1e8612c8a90126fc7029d95b56d25 /src/main_gui.cpp | |
| parent | 0646d307bd453357aeefdf9742028f6e0afec67e (diff) | |
| download | openttd-b7748a686eca83d53eddf0be888e6f58eb12d054.tar.xz | |
(svn r9897) -Codechange: prepare the toolbar for more road types.
Diffstat (limited to 'src/main_gui.cpp')
| -rw-r--r-- | src/main_gui.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 613ea7dce..94b6829a3 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -51,6 +51,7 @@ static int _rename_what = -1; static byte _terraform_size = 1; RailType _last_built_railtype; +RoadType _last_built_roadtype; static int _scengen_town_size = 1; // depress medium-sized towns per default extern void GenerateIndustries(); @@ -310,7 +311,8 @@ static void MenuClickBuildRail(int index) static void MenuClickBuildRoad(int index) { - ShowBuildRoadToolbar(); + _last_built_roadtype = (RoadType)index; + ShowBuildRoadToolbar(_last_built_roadtype); } static void MenuClickBuildWater(int index) @@ -930,12 +932,13 @@ static void ToolbarBuildRailClick(Window *w) const Player *p = GetPlayer(_local_player); Window *w2; w2 = PopupMainToolbMenu(w, 19, STR_1015_RAILROAD_CONSTRUCTION, RAILTYPE_END, ~p->avail_railtypes); - WP(w2,menu_d).sel_index = _last_built_railtype; + WP(w2, menu_d).sel_index = _last_built_railtype; } static void ToolbarBuildRoadClick(Window *w) { - PopupMainToolbMenu(w, 20, STR_180A_ROAD_CONSTRUCTION, 1, 0); + Window *w2 = PopupMainToolbMenu(w, 20, STR_180A_ROAD_CONSTRUCTION, 1, 0); + WP(w2, menu_d).sel_index = _last_built_roadtype; } static void ToolbarBuildWaterClick(Window *w) @@ -1873,7 +1876,7 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e) 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; - case WKC_SHIFT | WKC_F8: ShowBuildRoadToolbar(); break; + case WKC_SHIFT | WKC_F8: ShowBuildRoadToolbar(_last_built_roadtype); break; case WKC_SHIFT | WKC_F9: ShowBuildDocksToolbar(); break; case WKC_SHIFT | WKC_F10:ShowBuildAirToolbar(); break; case WKC_SHIFT | WKC_F11: ShowBuildTreesToolbar(); break; @@ -2514,6 +2517,7 @@ void InitializeMainGui() { /* Clean old GUI values */ _last_built_railtype = RAILTYPE_RAIL; + _last_built_roadtype = ROADTYPE_ROAD; } |