Adjust ordering of date/tick setup in InitializeGame

3 months ago · d3bbb4fb1c
parent b38321b9b4
commit d3bbb4fb1c
1 changed files with 6 additions and 4 deletions
--- a/src/misc.cpp
+++ b/src/misc.cpp
@ -152,7 +152,12 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 	_station_tile_cache_hash = 0;
 	InitGRFGlobalVars();
 	_loadgame_DBGL_data.clear();
-	if (reset_settings) MakeNewgameSettingsLive();
+	if (reset_settings) {
+		MakeNewgameSettingsLive();
+	} else {
+		UpdateEffectiveDayLengthFactor();
+		SetupTickRate();
+	}

 	_newgrf_profilers.clear();

@ -168,9 +173,6 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 		RecalculateStateTicksOffset();
 	}

-	UpdateEffectiveDayLengthFactor();
-	SetupTickRate();
-
 	UpdateCachedSnowLine();
 	UpdateCachedSnowLineBounds();