Fixes for abandoning camps #60521
Merged
Fixes for abandoning camps #60521
Conversation
This file contains 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
github-actions
bot
added
[C++]
|
Good work! |
github-actions
bot
added
astyled
irwiss
reviewed
Aug 28, 2022
dseguin
reviewed
Aug 29, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Bugfixes "Fix being unable to re-establish camps near abandoned camps as well crashing when attempting to access an abandoned camp's missions"
Purpose of change
Fixes #45731, fixes #47838, and fixes #47332
Describe the solution
When the game creates a camp, it adds camps to the global camps list, but also overwrites the overmap terrain where the camp is. When the game abandons a camp it only deletes the camp from the global camps list, but does not restore the previous overmap terrain from before the camp was constructed. This fix checks for an existence of a camp by checking both things, instead of just one.
Describe alternatives you've considered
It would be better if the previous overmap terrain was restored, but I think that is currently not possible, but I am not familiar with the map system. The downside of not restoring overmap terrain is that if a new camp is constructed in the same place, only the barebones camp type can be constructed.
Testing
Additional context