summaryrefslogtreecommitdiff
path: root/src/genworld.cpp
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2009-02-14 23:17:32 +0000
committeryexo <yexo@openttd.org>2009-02-14 23:17:32 +0000
commit6381cbeeaeb41975aedc1e6d350c99f3cc488044 (patch)
tree43e18e5dff5066194510325a031496915946c2d3 /src/genworld.cpp
parenta6350c0287860b883dffedc32981a1ef35e274ff (diff)
downloadopenttd-6381cbeeaeb41975aedc1e6d350c99f3cc488044.tar.xz
(svn r15495) -Revert (r15383,r15422): Loading NewGRFs depends on correct settings, but the economy can only be started after loading NewGRFs. In short: r15383 causes more problems then it's worth.
Diffstat (limited to 'src/genworld.cpp')
-rw-r--r--src/genworld.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/genworld.cpp b/src/genworld.cpp
index ff30e4720..1d6880208 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -284,13 +284,13 @@ void GenerateWorld(GenerateWorldMode mode, uint size_x, uint size_y)
/* 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);
- PrepareGenerateWorldProgress();
-
/* Load the right landscape stuff */
GfxLoadSprites();
LoadStringWidthTable();
+ InitializeGame(_gw.size_x, _gw.size_y, false);
+ PrepareGenerateWorldProgress();
+
/* Re-init the windowing system */
ResetWindowSystem();