summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2017-03-07 20:18:54 +0000
committerfrosch <frosch@openttd.org>2017-03-07 20:18:54 +0000
commit24786a71eec9f5bc4efb960f5a3966a243a0dfca (patch)
tree2e1ce2c7d1fa6731f368ed93f39380ec4db8c314 /src/saveload
parentf21798c1ba33314630dd14b317f31a2c5d1602d5 (diff)
downloadopenttd-24786a71eec9f5bc4efb960f5a3966a243a0dfca.tar.xz
(svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options.
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/newgrf_sl.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/saveload/newgrf_sl.cpp b/src/saveload/newgrf_sl.cpp
index dacc127ea..de261f02a 100644
--- a/src/saveload/newgrf_sl.cpp
+++ b/src/saveload/newgrf_sl.cpp
@@ -96,8 +96,16 @@ static void Load_NGRF()
{
Load_NGRF_common(_grfconfig);
- /* Append static NewGRF configuration, but only if there are some NewGRFs. */
- if (_game_mode != GM_MENU || _all_grfs != NULL) AppendStaticGRFConfigs(&_grfconfig);
+ if (_game_mode == GM_MENU) {
+ /* Intro game must not have NewGRF. */
+ if (_grfconfig != NULL) SlErrorCorrupt("The intro game must not use NewGRF");
+
+ /* Activate intro NewGRFs (townnames) */
+ ResetGRFConfig(false);
+ } else {
+ /* Append static NewGRF configuration */
+ AppendStaticGRFConfigs(&_grfconfig);
+ }
}
static void Check_NGRF()