Index: src/saveload/newgrf_sl.cpp
===================================================================
--- src/saveload/newgrf_sl.cpp (revision 27770)
+++ src/saveload/newgrf_sl.cpp (working copy)
@@ -96,8 +96,14 @@
{
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 {
+ AppendStaticGRFConfigs(&_grfconfig);
+ }
}
static void Check_NGRF()