From a7d6ebd5bd901409c29b1717d0edb67e7aa85bd6 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sat, 5 Oct 2019 20:37:48 +0200
Subject: [PATCH] Lavafall lava also kills rings
---
src/p_map.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/p_map.c b/src/p_map.c
index 56412a3b43..719a637b41 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -888,6 +888,15 @@ static boolean PIT_CheckThing(mobj_t *thing)
}
#endif
+ if (tmthing->type == MT_LAVAFALL_LAVA && (thing->type == MT_RING || thing->type == MT_REDTEAMRING || thing->type == MT_BLUETEAMRING || thing->type == MT_FLINGRING))
+ {
+ //height check
+ if (tmthing->z > thing->z + thing->height || thing->z > tmthing->z + tmthing->height || !(thing->health))
+ return true;
+
+ P_KillMobj(thing, tmthing, tmthing, DMG_FIRE);
+ }
+
if (tmthing->type == MT_MINECART)
{
//height check
--
GitLab