Fix a crash when npc tries to heal horse-mounted player #40025
Merged
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 "Fix a crash when npc tries to heal horse-mounted player."
Purpose of change
Fixes #40001.
game::shared_from
assumed that the player cannot be at the same location as a monster, which no longer holds now that mounting creatures is possible. If the player is mounted on a creatureg->shared_from( g->u )
returns the mounted creature, sopatient
innpc::execute_action
becomes nullptr after dynamic casting it toplayer
.Describe the solution
In
npc_execute_action
, checkpatient
is not null before dereferencing it.In
game::shared_from
, checkcritter
is a monster/npc before searching for its shared pointer, and only return the shared pointer if it refers to the same object ascritter
.Testing
Loaded the save from #40001 and it no longer crashed. NPCs now also heal the player when they are mounted.
Additional context
Should probably be backported to 0.E.