Codechange: Don't explicitly unset _generating_world outside of genworld.cpp #9418
+18
−14
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.
Motivation / Problem
While trying to understand the cause for #9407, I noticed some
They are relatively safe (mainly used in GUI code), but I think it can (and should) be done safer.
The only place
_generating_world
can be explicitly set tofalse
is in_GenerateWorld()
, ie during the real generation.Description
I just followed the idea of ffec9b4, and used
Backup
to replace all direct writes to_generating_world
from outside_GenerateWorld()
.One place was already doing a proper backup, but without using
Backup
, so I updated it too.Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.