summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-01-22 23:13:39 +0000
committerrubidium <rubidium@openttd.org>2011-01-22 23:13:39 +0000
commit1339d75f7510961fc664b84c299d165b60d84293 (patch)
treeee45fd7e16a4f7c7d3a03ecb9ea100e1fe094015 /src
parentd74fc0bee3fa3d9c5eb0308bc8cd12a7a3d2cb23 (diff)
downloadopenttd-1339d75f7510961fc664b84c299d165b60d84293.tar.xz
(svn r21896) -Cleanup: remove the unused StartScenario
Diffstat (limited to 'src')
-rw-r--r--src/openttd.cpp51
1 files changed, 0 insertions, 51 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp
index e2d4e39f4..1a7fa7c8b 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -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 mode, GameMode newgm, Subdirectory subdi
}
}
-/**
- * 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