Move GRF global var init to common function

src/gfxinit.cpp

@@ -160,6 +160,15 @@ void CheckExternalFiles()
 	if (add_pos != error_msg) ShowInfoF("%s", error_msg);
 }
 
+void InitGRFGlobalVars()
+{
+	extern uint _extra_station_names_used;
+	_extra_station_names_used = 0;
+
+	extern uint8 _extra_station_names_probability;
+	_extra_station_names_probability = 0;
+}
+
 /** Actually load the sprite tables. */
 static void LoadSpriteTables()
 {
@@ -228,11 +237,7 @@ static void LoadSpriteTables()
 	/* Initialize the unicode to sprite mapping table */
 	InitializeUnicodeGlyphMap();
 
-	extern uint _extra_station_names_used;
+	InitGRFGlobalVars();
-	_extra_station_names_used = 0;
-
-	extern uint8 _extra_station_names_probability;
-	_extra_station_names_probability = 0;
 
 	/*
 	 * Load the base and extra NewGRF with OTTD required graphics as first NewGRF.

src/misc.cpp

@@ -98,10 +98,9 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 	_game_load_date_fract = 0;
 	_game_load_tick_skip_counter = 0;
 	_game_load_time = 0;
-	_extra_station_names_used = 0;
-	_extra_station_names_probability = 0;
 	_extra_aspects = 0;
 	_aspect_cfg_hash = 0;
+	InitGRFGlobalVars();
 	_loadgame_DBGL_data.clear();
 	if (reset_settings) MakeNewgameSettingsLive();
 

src/newgrf.h

@@ -441,4 +441,6 @@ struct GrfSpecFeatureRef {
 const char *GetFeatureString(GrfSpecFeatureRef feature);
 const char *GetFeatureString(GrfSpecFeature feature);
 
+void InitGRFGlobalVars();
+
 #endif /* NEWGRF_H */

src/openttd.cpp

@@ -485,10 +485,9 @@ static void ShutdownGame()
 	_game_load_date_fract = 0;
 	_game_load_tick_skip_counter = 0;
 	_game_load_time = 0;
-	_extra_station_names_used = 0;
-	_extra_station_names_probability = 0;
 	_extra_aspects = 0;
 	_aspect_cfg_hash = 0;
+	InitGRFGlobalVars();
 	_loadgame_DBGL_data.clear();
 	_loadgame_DBGC_data.clear();
 }