From fe271b4e78db1c619b28fbac752a59ef23811095 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 29 Jan 2016 12:21:35 +0100 Subject: [PATCH] - fixed: A_MaceBallImpact2 was missing a check for hitting some liquid terrain. --- src/g_heretic/a_hereticweaps.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/g_heretic/a_hereticweaps.cpp b/src/g_heretic/a_hereticweaps.cpp index ba216a8ba..d4a63c144 100644 --- a/src/g_heretic/a_hereticweaps.cpp +++ b/src/g_heretic/a_hereticweaps.cpp @@ -505,6 +505,11 @@ DEFINE_ACTION_FUNCTION(AActor, A_MaceBallImpact2) AActor *tiny; angle_t angle; + if ((self->Z() <= self->floorz) && P_HitFloor (self)) + { // Landed in some sort of liquid + self->Destroy (); + return; + } if (self->flags & MF_INBOUNCE) { fixed_t floordist = self->Z() - self->floorz;