From 8ac13f58cb417c423d89eece8b2409c13e7c4697 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 17 Dec 2023 23:08:34 +0000 Subject: [PATCH] Saveload: Default savegame time units to days when loading vanilla saves --- src/saveload/afterload.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 61104daca1..f564348bf2 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -851,6 +851,11 @@ bool AfterLoadGame() /* Set day length factor to 1 if loading a pre day length savegame */ if (SlXvIsFeatureMissing(XSLFI_VARIABLE_DAY_LENGTH) && SlXvIsFeatureMissing(XSLFI_SPRINGPP) && SlXvIsFeatureMissing(XSLFI_JOKERPP) && SlXvIsFeatureMissing(XSLFI_CHILLPP)) { _settings_game.economy.day_length_factor = 1; + if (_file_to_saveload.abstract_ftype != FT_SCENARIO) { + /* If this is obviously a vanilla/non-patchpack savegame (and not a scenario), + * set the savegame time units to be in days, as they would have been previously. */ + _settings_game.game_time.time_in_minutes = false; + } } if (SlXvIsFeatureMissing(XSLFI_VARIABLE_DAY_LENGTH, 3)) { _scaled_tick_counter = (uint64)((_tick_counter * _settings_game.economy.day_length_factor) + _tick_skip_counter);