[DDA Port] Check mapgen dimensions, stop duplicating mapgen functions #2197
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
Previously there was no error if the dimensions of the "rows" array in mapgen was too large (there was an error when it was too small). Add such an error, and fix all the mapgen issues it finds. (cherry picked from commit adf846bfdf1182380fbd22cf33479f196222f8f7)
load_mapgen_function would add the mapgens it loaded to oter_mapgen. However, some of the call sites would also add the returned value to oter_mapgen anyway. This meant that some mapgens got added twice. This could effectively double their weights, and caused them to be sanity-checked multiple times. Separate the adding functionality into a new function load_and_add_mapgen_function so that it is clear when it's being added for you, but the one call site that needed special handling could perform its own adding separately. (cherry picked from commit e9046e9bae07dcac8375eb81b9cea14d7595c3de)
github-actions
bot
added
data
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 "Check mapgen dimensions, stop duplicating mapgen functions"
Purpose of change
Describe the solution
Port DDA PRs:
CleverRaven/Cataclysm-DDA#51431
CleverRaven/Cataclysm-DDA#59111
Testing
Loaded a world, saw no debug messages