Mercurial > hg > openttd

changeset 17158:05a943acaeda draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21896) -Cleanup: remove the unused StartScenario
author rubidium <rubidium@openttd.org>
date Sat, 22 Jan 2011 23:13:39 +0000
parents 0f65112b34f2
children 9b1a3a21da0a
files src/openttd.cpp
diffstat 1 files changed, 0 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -857,10 +857,6 @@
 	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 @@
 	}
 }
 
-/**
- * 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