diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index 5dbf96e112..ff1648296a 100644 --- a/src/gfxinit.cpp +++ b/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; - _extra_station_names_used = 0; - - extern uint8 _extra_station_names_probability; - _extra_station_names_probability = 0; + InitGRFGlobalVars(); /* * Load the base and extra NewGRF with OTTD required graphics as first NewGRF. diff --git a/src/misc.cpp b/src/misc.cpp index e512a17468..1415ed2dfa 100644 --- a/src/misc.cpp +++ b/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(); diff --git a/src/newgrf.h b/src/newgrf.h index 4dc6d29c4c..428a5c13d2 100644 --- a/src/newgrf.h +++ b/src/newgrf.h @@ -441,4 +441,6 @@ struct GrfSpecFeatureRef { const char *GetFeatureString(GrfSpecFeatureRef feature); const char *GetFeatureString(GrfSpecFeature feature); +void InitGRFGlobalVars(); + #endif /* NEWGRF_H */ diff --git a/src/openttd.cpp b/src/openttd.cpp index 0376e7badb..f4c82f1093 100644 --- a/src/openttd.cpp +++ b/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(); }