Skip to content

Fixes default turf saving #477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PsyCommando merged 1 commit into from
Dec 7, 2023
Merged

Fixes default turf saving #477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions mods/persistence/controllers/subsystems/persistence/persistence_saving.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,17 +205,21 @@
else
area_turf_count++

var/should_skip = __SHOULD_SKIP_TURF(T)
// These if statements checks to see if we should save this turf.
if(!should_skip && istype(T, default_turf) || !T.should_save)
if(__SHOULD_SKIP_TURF(T)) // This turf should not be saved, regardless of its contents.
continue

// This is a default turf, or otherwise is marked not to save. Only save if its contents should save.
if(istype(T, default_turf) || !T.should_save)
var/let_me_save = FALSE
for(var/atom/A as anything in T.contents)
if(A.should_save())
should_skip = FALSE
let_me_save = TRUE
break // We found a thing that's worth saving.
if(should_skip)
continue //Turfs not saved become their default_turf after deserialization.

//If we got through the filter save
if(!let_me_save)
continue // Failed to find anything worth saving, skip to the next turf.

//If we got through the filter, save
serializer.Serialize(T, null, z)

catch(var/exception/e_turf)
Expand Down