mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: be more resilient against missing towns in old loader

pull/11795/head
Rubidium 2024-01-15 19:22:51 +01:00 committed by rubidium42
parent 67b405d2f6
commit 51f1e939e8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/saveload/oldloader_sl.cpp
View File

@ -495,6 +495,14 @@ static void ClearOldMap3(TileIndex t)
tile.m4() = 0; tile.m4() = 0;
} }
static Town *RemapTown(TileIndex fallback)
{
/* In some cases depots, industries and stations could refer to a missing town. */
Town *t = Town::GetIfValid(RemapTownIndex(_old_town_index));
if (t == nullptr) t = CalcClosestTownFromTile(fallback);
return t;
}
static void ReadTTDPatchFlags() static void ReadTTDPatchFlags()
{ {
if (_read_ttdpatch_flags) return; if (_read_ttdpatch_flags) return;
@ -674,10 +682,7 @@ static bool LoadOldDepot(LoadgameState *ls, int num)
if (!LoadChunk(ls, d, depot_chunk)) return false; if (!LoadChunk(ls, d, depot_chunk)) return false;
if (d->xy != 0) { if (d->xy != 0) {
/* In some cases, there could be depots referencing invalid town. */ d->town = RemapTown(d->xy);
Town *t = Town::GetIfValid(RemapTownIndex(_old_town_index));
if (t == nullptr) t = Town::GetRandom();
d->town = t;
} else { } else {
delete d; delete d;
} }
@ -767,7 +772,7 @@ static bool LoadOldStation(LoadgameState *ls, int num)
if (!LoadChunk(ls, st, station_chunk)) return false; if (!LoadChunk(ls, st, station_chunk)) return false;
if (st->xy != 0) { if (st->xy != 0) {
st->town = Town::Get(RemapTownIndex(_old_town_index)); st->town = RemapTown(st->xy);
if (_savegame_type == SGT_TTO) { if (_savegame_type == SGT_TTO) {
if (IsInsideBS(_old_string_id, 0x180F, 32)) { if (IsInsideBS(_old_string_id, 0x180F, 32)) {
@ -843,7 +848,7 @@ static bool LoadOldIndustry(LoadgameState *ls, int num)
if (!LoadChunk(ls, i, industry_chunk)) return false; if (!LoadChunk(ls, i, industry_chunk)) return false;
if (i->location.tile != 0) { if (i->location.tile != 0) {
i->town = Town::Get(RemapTownIndex(_old_town_index)); i->town = RemapTown(i->location.tile);
if (_savegame_type == SGT_TTO) { if (_savegame_type == SGT_TTO) {
if (i->type > 0x06) i->type++; // Printing Works were added if (i->type > 0x06) i->type++; // Printing Works were added