Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash in Xom's wave of despair effect #4037

Merged
merged 1 commit into from
Sep 19, 2024

Conversation

seandewar
Copy link
Contributor

If place_monster_corpse returns nullptr, the game crashes when trying to call turn_corpse_into_skeleton.

Possible when placing a skeleton on a terrain feature that destroys items, like lava. (move_item_to_grid destroys the would-be corpse item)

Example crash log: https://underhound.eu/crawl/morgue/seandewar5/crash-seandewar5-20240902-225318.txt

If place_monster_corpse returns nullptr, the game crashes when trying to call
turn_corpse_into_skeleton.

Possible when placing a skeleton on a terrain feature that destroys items, like
lava. (move_item_to_grid destroys the would-be corpse item)

Example crash log: https://underhound.eu/crawl/morgue/seandewar5/crash-seandewar5-20240902-225318.txt
@regret-index regret-index merged commit 36d77be into crawl:master Sep 19, 2024
40 checks passed
@regret-index
Copy link
Contributor

(...Sorry your name isn't on the commit- I was trying out Github's PR merging options and didn't realize that it'd override the author after auto-wrapping the crash log url unless I specified otherwise. Thank you for submitting this PR and fixing the bug.)

@seandewar
Copy link
Contributor Author

seandewar commented Sep 19, 2024

Thanks and no problem! Seems it was added via a merge commit, which references the commit from my branch as a parent anyway. 👍

If that wasn't desired, GitHub's "squash and merge" feature may be useful: it combines all commits into one, keeping author metadata, and merges it without creating the extra merge commit; you'll have the option of editing its message too, but by default GitHub appends the PR number at the end of the first line. (There's also "rebase and merge" if squashing isn't wanted, but I can't recall if you're given the option to edit the messages or not when there's more than one commit)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants