Changeset - r22565:eeb3e099b586
[Not reviewed]
master
0 1 0
frosch - 8 years ago 2017-03-07 20:18:54
frosch@openttd.org
(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.
1 file changed with 10 insertions and 2 deletions:
0 comments (0 inline, 0 general)
src/saveload/newgrf_sl.cpp
Show inline comments
 
@@ -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()
0 comments (0 inline, 0 general)