cpp/openttd-patchpack/source Changeset - r17148:d563792b69d7

Changeset - r17148:d563792b69d7

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 13 years ago 2011-01-22 23:13:39
rubidium@openttd.org

(svn r21896) -Cleanup: remove the unused StartScenario

1 file changed with 0 insertions and 51 deletions:

src/openttd.cpp

0 comments (0 inline, 0 general)

src/openttd.cpp

➞

Show inline comments

@@ @@ -857,10 +857,6 @@ static void MakeNewEditorWorld() @@
 	GenerateWorld(GWM_EMPTY, 1 << _settings_game.game_creation.map_x, 1 << _settings_game.game_creation.map_y);
+}
 void StartupCompanies();
 void StartupDisasters();
 extern void StartupEconomy();
 /**
  * Load the specified savegame but on error do different things.
  * If loading fails due to corrupt savegame, bad version, etc. go back to
@@ @@ -913,53 +909,6 @@ bool SafeLoad(const char *filename, int @@
+	}
+}
 /**
  * Start Scenario starts a new game based on a scenario.
  * Eg 'New Game' --> select a preset scenario
  * This starts a scenario based on your current difficulty settings
  */
 static void StartScenario()
+{
 	_game_mode = GM_NORMAL;
 	/* invalid type */
 	if (_file_to_saveload.mode == SL_INVALID) {
 		DEBUG(sl, 0, "Savegame is obsolete or invalid format: '%s'", _file_to_saveload.name);
 		SetDParamStr(0, GetSaveLoadErrorString());
 		ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR);
 		_game_mode = GM_MENU;
 		return;
+	}
 	/* Reinitialize windows */
 	ResetWindowSystem();
 	SetupColoursAndInitialWindow();
 	ResetGRFConfig(true);
 	/* Load game */
 	if (!SafeLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL, SCENARIO_DIR)) {
 		SetDParamStr(0, GetSaveLoadErrorString());
 		ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR);
 		return;
+	}
 	_settings_game.difficulty = _settings_newgame.difficulty;
 	/* Inititalize data */
 	StartupEconomy();
 	StartupCompanies();
 	StartupEngines();
 	StartupDisasters();
 	SetLocalCompany(COMPANY_FIRST);
 	Company *c = Company::Get(COMPANY_FIRST);
 	c->settings = _settings_client.company;
 	MarkWholeScreenDirty();
+}
 void SwitchToMode(SwitchMode new_mode)
+{
 #ifdef ENABLE_NETWORK

0 comments (0 inline, 0 general)