summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-02-08 23:06:56 +0000
committerrubidium <rubidium@openttd.org>2009-02-08 23:06:56 +0000
commit7b8c13fa5c7cdaac1342fd7c8244721739e2354c (patch)
tree8461f8892707a973f4dd6f358fd72e40c03524c8 /src
parentebd72fa0fd4785437e80a0820ce1acdb3829e09a (diff)
downloadopenttd-7b8c13fa5c7cdaac1342fd7c8244721739e2354c.tar.xz
(svn r15422) -Fix [FS#2623] (r15383): loading NewGRFs before copying the settings.
Diffstat (limited to 'src')
-rw-r--r--src/genworld.cpp6
-rw-r--r--src/openttd.cpp4
2 files changed, 7 insertions, 3 deletions
diff --git a/src/genworld.cpp b/src/genworld.cpp
index d1955f27d..07f98fa58 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();
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 85c51cce7..21b9ed4d9 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -649,6 +649,10 @@ int ttd_main(int argc, char *argv[])
InitializeGUI();
IConsoleCmdExec("exec scripts/autoexec.scr 0");
+ /* Initialise the sprite/string tables. */
+ GfxLoadSprites();
+ LoadStringWidthTable();
+
GenerateWorld(GW_EMPTY, 64, 64); // Make the viewport initialization happy
WaitTillGeneratedWorld();