diff options
author | frosch <frosch@openttd.org> | 2011-07-29 22:23:17 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2011-07-29 22:23:17 +0000 |
commit | c9e920f1ebbeffb44ea44a240ad93ea246b14d7f (patch) | |
tree | 2d22f1ebdf356ee4284667d22d1416527cd7084b /src/openttd.cpp | |
parent | 793ec45a7370a9e066968b24489f1d20ee5dd330 (diff) | |
download | openttd-c9e920f1ebbeffb44ea44a240ad93ea246b14d7f.tar.xz |
(svn r22693) -Fix [FS#4691]: The override managers were not reset in some cases like creating a new scenario.
Diffstat (limited to 'src/openttd.cpp')
-rw-r--r-- | src/openttd.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 6cf40ffba..a5fde97e9 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -231,17 +231,6 @@ static void ParseResolution(Dimension *res, const char *s) res->height = max(strtoul(t + 1, NULL, 0), 64UL); } -static void InitializeDynamicVariables() -{ - /* Dynamic stuff needs to be initialized somewhere... */ - _engine_mngr.ResetToDefaultMapping(); - _house_mngr.ResetMapping(); - _industry_mngr.ResetMapping(); - _industile_mngr.ResetMapping(); - _airport_mngr.ResetMapping(); - _airporttile_mngr.ResetMapping(); -} - /** * Unitializes drivers, frees allocated memory, cleans pools, ... @@ -553,9 +542,6 @@ int ttd_main(int argc, char *argv[]) /* initialize screenshot formats */ InitializeScreenshotFormats(); - /* initialize all variables that are allocated dynamically */ - InitializeDynamicVariables(); - /* Initialize FreeType */ InitFreeType(); @@ -780,7 +766,6 @@ static void MakeNewGame(bool from_heightmap, bool reset_settings) _game_mode = GM_NORMAL; ResetGRFConfig(true); - InitializeDynamicVariables(); GenerateWorldSetCallback(&MakeNewGameDone); GenerateWorld(from_heightmap ? GWM_HEIGHTMAP : GWM_NEWGAME, 1 << _settings_game.game_creation.map_x, 1 << _settings_game.game_creation.map_y, reset_settings); |