# HG changeset patch # User belugas # Date 2008-06-30 14:58:58 # Node ID de0a6bd4a5970edd6e29a10a80d96981cd36e257 # Parent 1610a18f7e009d238b918fb93ad076047bab3b8d (svn r13663) -Codechange: Use a default parameter, hoping to reduce the different signatures of functions in menus diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -281,7 +281,7 @@ static void ToolbarScenSaveOrLoad(Window PopupMainToolbMenu(w, TBSE_SAVESCENARIO, STR_0292_SAVE_SCENARIO, SLEME_MENUCOUNT); } -static void MenuClickSaveLoad(int index) +static void MenuClickSaveLoad(int index = 0) { if (_game_mode == GM_EDITOR) { switch (index) { @@ -939,7 +939,7 @@ struct MainToolbarWindow : Window { switch (keycode) { case WKC_F1: case WKC_PAUSE: ToolbarPauseClick(this); break; case WKC_F2: ShowGameOptions(); break; - case WKC_F3: MenuClickSaveLoad(0); break; + case WKC_F3: MenuClickSaveLoad(); break; case WKC_F4: ShowSmallMap(); break; case WKC_F5: ShowTownDirectory(); break; case WKC_F6: ShowSubsidiesList(); break; @@ -1144,7 +1144,7 @@ public: switch (keycode) { case WKC_F1: case WKC_PAUSE: ToolbarPauseClick(this); break; case WKC_F2: ShowGameOptions(); break; - case WKC_F3: MenuClickSaveLoad(0); break; + case WKC_F3: MenuClickSaveLoad(); break; case WKC_F4: ToolbarScenGenLand(this); break; case WKC_F5: ToolbarScenGenTown(this); break; case WKC_F6: ToolbarScenGenIndustry(this); break;