diff options
| -rw-r--r-- | src/genworld.cpp | 7 | ||||
| -rw-r--r-- | src/misc.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/genworld.cpp b/src/genworld.cpp index b0bdfe8d2..2bc8d97ff 100644 --- a/src/genworld.cpp +++ b/src/genworld.cpp @@ -283,18 +283,19 @@ void GenerateWorld(GenerateWorldMode mode, uint size_x, uint size_y, bool reset_ /* Set the date before loading sprites as some newgrfs check it */ SetDate(ConvertYMDToDate(_settings_game.game_creation.starting_year, 0, 1)); + InitializeGame(_gw.size_x, _gw.size_y, false, reset_settings); + PrepareGenerateWorldProgress(); + /* Load the right landscape stuff */ GfxLoadSprites(); LoadStringWidthTable(); - InitializeGame(_gw.size_x, _gw.size_y, false, reset_settings); - PrepareGenerateWorldProgress(); - /* Re-init the windowing system */ ResetWindowSystem(); /* Create toolbars */ SetupColoursAndInitialWindow(); + SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, HT_NONE, WC_MAIN_WINDOW, 0); if (_gw.thread != NULL) { _gw.thread->Join(); diff --git a/src/misc.cpp b/src/misc.cpp index 34a2285f2..017913ed0 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -63,8 +63,6 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin AllocateMap(size_x, size_y); - SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, HT_NONE, WC_MAIN_WINDOW, 0); - _pause_mode = PM_UNPAUSED; _fast_forward = 0; _tick_counter = 0; |