diff options
author | yexo <yexo@openttd.org> | 2009-02-14 23:17:32 +0000 |
---|---|---|
committer | yexo <yexo@openttd.org> | 2009-02-14 23:17:32 +0000 |
commit | 1f9ec758aac11f97458b6bb609fc44cf5ff5b086 (patch) | |
tree | 43e18e5dff5066194510325a031496915946c2d3 /src/genworld.cpp | |
parent | a0b57c849e64c0f8969ee8ede538c5c7fa848762 (diff) | |
download | openttd-1f9ec758aac11f97458b6bb609fc44cf5ff5b086.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.cpp | 6 |
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(); |