cpp/openttd-patchpack/source Changeset - r9610:de0a6bd4a597

Changeset - r9610:de0a6bd4a597

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

belugas - 16 years ago 2008-06-30 14:58:58
belugas@openttd.org

(svn r13663) -Codechange: Use a default parameter, hoping to reduce the different signatures of functions in menus

1 file changed with 3 insertions and 3 deletions:

src/toolbar_gui.cpp

0 comments (0 inline, 0 general)

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -278,13 +278,13 @@ static void ToolbarSaveClick(Window *w) @@
 static void ToolbarScenSaveOrLoad(Window *w)
+{
 	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) {
 			case SLEME_SAVE_SCENARIO:  ShowSaveLoadDialog(SLD_SAVE_SCENARIO);  break;
 			case SLEME_LOAD_SCENARIO:  ShowSaveLoadDialog(SLD_LOAD_SCENARIO);  break;
 			case SLEME_LOAD_HEIGHTMAP: ShowSaveLoadDialog(SLD_LOAD_HEIGHTMAP); break;
@@ @@ -936,13 +936,13 @@ struct MainToolbarWindow : Window { @@
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
+	{
 		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;
 			case WKC_F7: ShowPlayerStations(_local_player); break;
 			case WKC_F8: ShowPlayerFinances(_local_player); break;
 			case WKC_F9: ShowPlayerCompany(_local_player); break;
@@ @@ -1141,13 +1141,13 @@ public: @@
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
+	{
 		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;
 			case WKC_F7: ToolbarScenBuildRoad(this); break;
 			case WKC_F8: ToolbarScenBuildDocks(this); break;
 			case WKC_F9: ToolbarScenPlantTrees(this); break;

0 comments (0 inline, 0 general)