Mercurial > hg > openttd

changeset 18002:6e7281a51bb6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22811) -Change: don't try to load static NewGRFs when loading the intro game for the first time
author rubidium <rubidium@openttd.org>
date Mon, 22 Aug 2011 12:54:17 +0000
parents 6e430c0b722b
children dbdece479bf5
files src/saveload/newgrf_sl.cpp
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/saveload/newgrf_sl.cpp
+++ b/src/saveload/newgrf_sl.cpp
@@ -95,8 +95,8 @@
 {
 	Load_NGRF_common(_grfconfig);
 
-	/* Append static NewGRF configuration */
-	AppendStaticGRFConfigs(&_grfconfig);
+	/* Append static NewGRF configuration, but only if there are some NewGRFs. */
+	if (_game_mode != GM_MENU || _all_grfs != NULL) AppendStaticGRFConfigs(&_grfconfig);
 }
 
 static void Check_NGRF()