nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Cache and restore gb.bhitpos in water_damage_chain

Browse Source 
If throwing an item while levitating sent the hero hurtling into a wall
of water, the item would land in the water due to water_damage_chain's
use of bhitpos.  Restore the previous value when it is finished to avoid
interfering with the use of bhitpos further up the call stack.
This commit is contained in:
Michael Meyer
2023-11-03 10:31:09 -04:00
committed by PatR
parent 5ba7939110
commit ccf997b28b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/trap.c
View File

@@ -4587,6 +4587,7 @@ water_damage_chain(
{ {
struct obj *otmp; struct obj *otmp;
coordxy x, y; coordxy x, y;
coord save_bhitpos;
if (!obj) if (!obj)
return; return;
@@ -4595,7 +4596,10 @@ water_damage_chain(
acid nor unseen have exploded during this water damage sequence */ acid nor unseen have exploded during this water damage sequence */
ga.acid_ctx.dkn_boom = ga.acid_ctx.unk_boom = 0; ga.acid_ctx.dkn_boom = ga.acid_ctx.unk_boom = 0;
ga.acid_ctx.ctx_valid = TRUE; ga.acid_ctx.ctx_valid = TRUE;
/* we don't want to permanently overwrite bhitpos below, since we can get
here from scenarios where it was in use up the call stack (e.g. thrown
item hurtling the levitating hero into a wall of water) */
save_bhitpos = gb.bhitpos;
/* erode_obj() relies on bhitpos if target objects aren't carried by /* erode_obj() relies on bhitpos if target objects aren't carried by
the hero or a monster, to check visibility controlling feedback */ the hero or a monster, to check visibility controlling feedback */
if (get_obj_location(obj, &x, &y, CONTAINED_TOO)) if (get_obj_location(obj, &x, &y, CONTAINED_TOO))
@@ -4606,9 +4610,10 @@ water_damage_chain(
water_damage(obj, (char *) 0, FALSE); water_damage(obj, (char *) 0, FALSE);
} }
/* reset acid context */ /* reset acid context and bhitpos */
ga.acid_ctx.dkn_boom = ga.acid_ctx.unk_boom = 0; ga.acid_ctx.dkn_boom = ga.acid_ctx.unk_boom = 0;
ga.acid_ctx.ctx_valid = FALSE; ga.acid_ctx.ctx_valid = FALSE;
gb.bhitpos = save_bhitpos;
} }
/* /*