diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-28 23:22:33 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-28 23:27:28 (GMT) |
| commit | 1f4f50682c9b1d093498c353811eb589d5a8885e (patch) | |
| tree | 36ec374b824de468631e5f0174d5075cd79d0de8 /src/elements | |
| parent | 966f1dcc235d65943d14e2a99058de709a15659a (diff) | |
| download | powder-1f4f50682c9b1d093498c353811eb589d5a8885e.zip powder-1f4f50682c9b1d093498c353811eb589d5a8885e.tar.gz | |
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.
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/stkm.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c index 1a43525..c1b3d6b 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); + } } } |
