diff options
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/afterload.cpp | 3 | ||||
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 5937318aa..3a8e58ab4 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -2756,8 +2756,9 @@ bool AfterLoadGame() } if (IsSavegameVersionBefore(178)) { + extern uint8 _old_diff_level; /* Initialise script settings profile */ - _settings_game.script.settings_profile = IsInsideMM(_settings_game.difficulty.diff_level, SP_BEGIN, SP_END) ? _settings_game.difficulty.diff_level : (uint)SP_MEDIUM; + _settings_game.script.settings_profile = IsInsideMM(_old_diff_level, SP_BEGIN, SP_END) ? _old_diff_level : (uint)SP_MEDIUM; } /* Road stops is 'only' updating some caches */ diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index bbc9cbb94..d36ba54f8 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1573,6 +1573,7 @@ extern TileIndex _cur_tileloop_tile; extern uint16 _disaster_delay; extern byte _trees_tick_ctr; extern byte _age_cargo_skip_counter; // From misc_sl.cpp +extern uint8 _old_diff_level; static const OldChunks main_chunk[] = { OCL_ASSERT( OC_TTD, 0 ), OCL_ASSERT( OC_TTO, 0 ), @@ -1718,7 +1719,7 @@ static const OldChunks main_chunk[] = { OCL_ASSERT( OC_TTD, 0x77130 ), - OCL_VAR ( OC_UINT8, 1, &_settings_game.difficulty.diff_level ), + OCL_VAR ( OC_UINT8, 1, &_old_diff_level ), OCL_VAR ( OC_TTD | OC_UINT8, 1, &_settings_game.game_creation.landscape ), OCL_VAR ( OC_TTD | OC_UINT8, 1, &_trees_tick_ctr ), @@ -1777,7 +1778,7 @@ bool LoadTTDMain(LoadgameState *ls) FixOldVehicles(); /* We have a new difficulty setting */ - _settings_game.difficulty.town_council_tolerance = Clamp(_settings_game.difficulty.diff_level, 0, 2); + _settings_game.difficulty.town_council_tolerance = Clamp(_old_diff_level, 0, 2); DEBUG(oldloader, 3, "Finished converting game data"); DEBUG(oldloader, 1, "TTD(Patch) savegame successfully converted"); @@ -1820,7 +1821,7 @@ bool LoadTTOMain(LoadgameState *ls) FixTTOCompanies(); /* We have a new difficulty setting */ - _settings_game.difficulty.town_council_tolerance = Clamp(_settings_game.difficulty.diff_level, 0, 2); + _settings_game.difficulty.town_council_tolerance = Clamp(_old_diff_level, 0, 2); /* SVXConverter about cargo payment rates correction: * "increase them to compensate for the faster time advance in TTD compared to TTO |