persistence: fall back to fortress_site when site_id is unassigned - #5923
Open
Alistair-Afton wants to merge 1 commit into
Open
Alistair-Afton wants to merge 1 commit into
Alistair-Afton wants to merge 1 commit into
Conversation
On a newly reclaimed fortress, plotinfo->site_id stays -1 until the first save, so the persistent site data API (dfhack.persistent .saveSiteData/getSiteData, World::IsSiteLoaded, and everything built on them) failed for the whole initial session. The fortress_site pointer is already set at embark time, so use it as a fallback when site_id is negative. Fixes DFHack#5716
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #5716
On a newly reclaimed fortress,
plotinfo->site_idstays-1until the first save. The persistent site data API (World::GetCurrentSiteId→AddPersistentSiteData/GetPersistentSiteData→dfhack.persistent.saveSiteData/getSiteData, andIsSiteLoadedgating theSC_MAP_LOADEDdata load) therefore failed for the entire initial reclaim session — producingunable to save dataerrors fromautotrainingandbuildingplanand leaving buildingplan's per-site filter config unloaded (the inoperative "Global settings" buttons).The
plotinfo->main.fortress_sitepointer is already set at embark time, so use it as a fallback whensite_idis negative. On reclaim it points at the reclaimed site — the sameworld_siterecord thatsite_idresolves to once assigned (site history continues on the same record, e.g.history_event_site_retiredstwithIS_UNRETIRE).Test plan
plotinfo.site_idtemporarily set to -1,dfhack.persistent.saveSiteDatafailed withunable to save data in key ...getSiteData/deleteSiteDataverified against site id 25 both via the fallback and via normalsite_idresolution)