cpp/openttd-patchpack/source File Diff

File diff r17723:6066720a27e8 → r17724:6876a287d8b6

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -346,27 +346,28 @@ static CallBackFunction MenuClickSetting @@
 		case OME_TRANSPARENTBUILDINGS: ToggleTransparency(TO_HOUSES);                   break;
 		case OME_SHOW_STATIONSIGNS:    ToggleTransparency(TO_SIGNS);                    break;
+	}
 	MarkWholeScreenDirty();
 	return CBF_NONE;
+}
 /* --- Saving/loading button menu --- */
 enum SaveLoadEditorMenuEntries {
 	SLEME_SAVE_SCENARIO   = 0,
 	SLEME_LOAD_SCENARIO,
 	SLEME_SAVE_HEIGHTMAP,
 	SLEME_LOAD_HEIGHTMAP,
 	SLEME_EXIT_TOINTRO,
-	SLEME_EXIT_GAME       = 5,
+	SLEME_EXIT_GAME       = 6,
 	SLEME_MENUCOUNT,
 };
 enum SaveLoadNormalMenuEntries {
 	SLNME_SAVE_GAME   = 0,
 	SLNME_LOAD_GAME,
 	SLNME_EXIT_TOINTRO,
 	SLNME_EXIT_GAME,
 	SLNME_MENUCOUNT,
 };
 static CallBackFunction ToolbarSaveClick(Window *w)
@@ @@ -378,24 +379,25 @@ static CallBackFunction ToolbarSaveClick @@
 static CallBackFunction ToolbarScenSaveOrLoad(Window *w)
+{
 	PopupMainToolbMenu(w, TBSE_SAVESCENARIO, STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO, SLEME_MENUCOUNT);
 	return CBF_NONE;
+}
 static CallBackFunction 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_SAVE_HEIGHTMAP: ShowSaveLoadDialog(SLD_SAVE_HEIGHTMAP); break;
 			case SLEME_LOAD_HEIGHTMAP: ShowSaveLoadDialog(SLD_LOAD_HEIGHTMAP); break;
 			case SLEME_EXIT_TOINTRO:   AskExitToGameMenu();                    break;
 			case SLEME_EXIT_GAME:      HandleExitGameRequest();                break;
+		}
 	} else {
 		switch (index) {
 			case SLNME_SAVE_GAME:      ShowSaveLoadDialog(SLD_SAVE_GAME); break;
 			case SLNME_LOAD_GAME:      ShowSaveLoadDialog(SLD_LOAD_GAME); break;
 			case SLNME_EXIT_TOINTRO:   AskExitToGameMenu();               break;
 			case SLNME_EXIT_GAME:      HandleExitGameRequest();           break;
+		}
+	}