summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/stkm.c3
-rw-r--r--src/elements/stkm2.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/elements/stkm.c b/src/elements/stkm.c
index 01990f6..55fc225 100644
--- a/src/elements/stkm.c
+++ b/src/elements/stkm.c
@@ -211,7 +211,8 @@ int update_STKM(UPDATE_FUNC_ARGS) {
if ((r&0xFF) == PT_NEUT)
{
- parts[i].life -= (102-parts[i].life)/2;
+ if (parts[i].life<=100) parts[i].life -= (102-parts[i].life)/2;
+ else parts[i].life *= 0.9f;
kill_part(r>>8);
}
if (bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_FAN)
diff --git a/src/elements/stkm2.c b/src/elements/stkm2.c
index a2731a6..02ed09f 100644
--- a/src/elements/stkm2.c
+++ b/src/elements/stkm2.c
@@ -211,7 +211,8 @@ int update_STKM2(UPDATE_FUNC_ARGS) {
if ((r&0xFF) == PT_NEUT)
{
- parts[i].life -= (102-parts[i].life)/2;
+ if (parts[i].life<=100) parts[i].life -= (102-parts[i].life)/2;
+ else parts[i].life *= 0.9f;
kill_part(r>>8);
}
if (bmap[(ry+y)/CELL][(rx+x)/CELL]==WL_FAN)