dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer save/load water region invalidation states

Browse Source 
Move InitializeWaterRegions to AllocateMap
No longer ForceUpdate in InitializeWaterRegions
This commit is contained in:
Jonathan G Rennison
2024-01-10 00:51:44 +00:00
parent 9206fa1fce
commit 936d636cdd
11 changed files with 10 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/saveload/afterload.cpp
View File

@@ -4399,8 +4399,6 @@ bool AfterLoadGame()
c->settings = _settings_client.company;
}
if (IsSavegameVersionBefore(SLV_WATER_REGIONS) && SlXvIsFeatureMissing(XSLFI_WATER_REGIONS)) InitializeWaterRegions();
return true;
}

10
src/saveload/water_regions_sl.cpp
View File

@@ -26,12 +26,6 @@ struct WRGNChunkHandler : ChunkHandler {
void Save() const override
{
SlTableHeader(_water_region_desc);
int index = 0;
for (WaterRegionSaveLoadInfo &region : GetWaterRegionSaveLoadInfo()) {
SlSetArrayIndex(index++);
SlObject(&region, _water_region_desc);
}
}
void Load() const override
@@ -40,14 +34,10 @@ struct WRGNChunkHandler : ChunkHandler {
int index;
std::vector<WaterRegionSaveLoadInfo> loaded_info;
while ((index = SlIterateArray()) != -1) {
WaterRegionSaveLoadInfo region_info;
SlObject(&region_info, slt);
loaded_info.push_back(std::move(region_info));
}
LoadWaterRegions(loaded_info);
}
};