Fixed crash when generating map #34148
Merged
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
BevapDin
reviewed
Sep 21, 2019
ipcyborg
changed the title
ZhilkinSerg
added
<Bugfix>
Removed grid initialization for all z-levels. Ensured that new submap on generation will not overwrite existing one. Setsubmap to null in grid after deletion.
ipcyborg
changed the title
BevapDin
approved these changes
Sep 27, 2019
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
SUMMARY: Bugfixes "Crash when generating map"Purpose of change
Fixes #33640, fixes #34028
Describe the solution
Originally the submap was inserted always at 0 z-level { gridx, gridy }, but used, saved and deleted on specific z-level i, j, p.z.
Fixed new submap inserting on correct z-level. Added some extra checks.
Describe alternatives you've considered
gridinmapconstructor, not ingenerate, when it is resized. Too much of a change, probably incorrect.griduntil it is required (whengetsubmapis used and there isnullptrthere). Not sure if this is efficient.Additional context
Thanks for a great mod
Extra_Bandits.zipprovided in #33640 - it was almost 100% reproducible.Tested after the fix for about 10 new starts, no crash. Still more testing is required.