Fix crash upon initial mapgen (after staring a new game, while generating the world for the first time). #36677
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
Access the local map instance instead. Also use `random_point` instead of manual logic.
ZhilkinSerg
added
<Bugfix>
|
Must be causing #36690. |
ZhilkinSerg
reviewed
Jan 4, 2020
| return g->is_empty( p ) && tmp.can_move_to( p ); | ||
| // Checking for creatures via g is only meaningful if this is the main game map. | ||
| // If it's some local map instance, the coordinates will most likely not even match. | ||
| return ( !g || &g->m != this || g->critter_at( p ) ) && tmp.can_move_to( p ); |
There was a problem hiding this comment.
Critter check should be negated, so monsters could spawn to empty places. Now they are trying to spawn to non-empty tiles.
Also I think we could move !g and map check on top of the function to bail out early.
This was referenced Jan 5, 2020
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: NoneWhen this triggers some specific map extras (e.g.
max_corpse),game::is_emptyis called, which in turn checks the main game map. However, that main game map is not loaded yet (we're in the middle of generating it).This changes access to
game::is_emptyto access the local map instead.game::is_emptychecks three things:Also use
random_pointinstead of manual logic.