summaryrefslogtreecommitdiff
path: root/src/simulation/elements/STKM.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-07-25 17:27:08 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-07-25 17:27:08 (GMT)
commit1e5eba3583960624a811cde461a34901c74f1b8c (patch)
treeb218049f9c45d6616a168fc36427f01d42c08f60 /src/simulation/elements/STKM.cpp
parent41cbd69ac807b79919649865293de2af8c50cbf7 (diff)
downloadpowder-1e5eba3583960624a811cde461a34901c74f1b8c.zip
powder-1e5eba3583960624a811cde461a34901c74f1b8c.tar.gz
TPT: Make VOID and BHOL eat stickmen again 1f4f50682c
Diffstat (limited to 'src/simulation/elements/STKM.cpp')
-rw-r--r--src/simulation/elements/STKM.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp
index ca564a3..fb0ade0 100644
--- a/src/simulation/elements/STKM.cpp
+++ b/src/simulation/elements/STKM.cpp
@@ -510,6 +510,18 @@ void Element_STKM::STKM_interact(Simulation * sim, playerst* playerp, int i, int
break;
}
}
+ if (((r&0xFF)==PT_BHOL || (r&0xFF)==PT_NBHL) && parts[i].type)
+ {
+ if (!sim->legacy_enable)
+ {
+ parts[r>>8].temp = restrict_flt(parts[r>>8].temp+parts[i].temp/2, MIN_TEMP, MAX_TEMP);
+ }
+ sim->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)
+ {
+ sim->kill_part(i);
+ }
}
}