diff options
| author | rubidium <rubidium@openttd.org> | 2011-08-22 12:54:17 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-08-22 12:54:17 +0000 |
| commit | 21f194bbf21bc0e71e533e451a2b24ff5ccb4153 (patch) | |
| tree | 56bf741f39859e26751103bd9d4ba3db2d83ec2b /src/saveload/newgrf_sl.cpp | |
| parent | 9c73f15cdeb044ae83a116d14ece3188d4868a3c (diff) | |
| download | openttd-21f194bbf21bc0e71e533e451a2b24ff5ccb4153.tar.xz | |
(svn r22811) -Change: don't try to load static NewGRFs when loading the intro game for the first time
Diffstat (limited to 'src/saveload/newgrf_sl.cpp')
| -rw-r--r-- | src/saveload/newgrf_sl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/saveload/newgrf_sl.cpp b/src/saveload/newgrf_sl.cpp index df0f462a3..c64ceea1e 100644 --- a/src/saveload/newgrf_sl.cpp +++ b/src/saveload/newgrf_sl.cpp @@ -95,8 +95,8 @@ static void Load_NGRF() { 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() |