From 1f4f50682c9b1d093498c353811eb589d5a8885e Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Fri, 29 Jun 2012 00:22:33 +0100 Subject: [PATCH] Make VOID and BHOL eat stickmen again Broken by making stickmen heads pass through everything, since the eating happened in try_move, which stickmen no longer use for head movement. --- src/elements/stkm.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/elements/stkm.c b/src/elements/stkm.c index 1a43525c9..c1b3d6b03 100644 --- a/src/elements/stkm.c +++ b/src/elements/stkm.c @@ -476,6 +476,19 @@ void STKM_interact(playerst* playerp, int i, int x, int y) break; } } + + if (((r&0xFF)==PT_BHOL || (r&0xFF)==PT_NBHL) && parts[i].type) + { + if (!legacy_enable) + { + parts[r>>8].temp = restrict_flt(parts[r>>8].temp+parts[i].temp/2, MIN_TEMP, MAX_TEMP); + } + kill_part(i); + } + if (((r&0xFF)==PT_VOID || ((r&0xFF)==PT_PVOD && parts[r>>8].life==10)) && (!parts[r>>8].ctype || (parts[r>>8].ctype==parts[i].type)!=(parts[r>>8].tmp&1)) && parts[i].type) + { + kill_part(i); + } } }