diff --git a/src/g_heretic/a_hereticweaps.cpp b/src/g_heretic/a_hereticweaps.cpp index d4a63c144..899514139 100644 --- a/src/g_heretic/a_hereticweaps.cpp +++ b/src/g_heretic/a_hereticweaps.cpp @@ -512,21 +512,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_MaceBallImpact2) } if (self->flags & MF_INBOUNCE) { - fixed_t floordist = self->Z() - self->floorz; - fixed_t ceildist = self->ceilingz - self->Z(); - fixed_t vel; - - // NOTE: The assumptions being made here about the plane to use for bouncing off are dead wrong. - // http://forum.zdoom.org/viewtopic.php?f=2&t=50449 - if (floordist <= ceildist) - { - vel = MulScale32 (self->velz, self->Sector->floorplane.c); - } - else - { - vel = MulScale32 (self->velz, self->Sector->ceilingplane.c); - } - if (vel < 2) + if (self->velz < 2*FRACUNIT) { goto boom; } @@ -624,21 +610,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_DeathBallImpact) } if (self->flags & MF_INBOUNCE) { - fixed_t floordist = self->Z() - self->floorz; - fixed_t ceildist = self->ceilingz - self->Z(); - fixed_t vel; - - // NOTE: The assumptions being made here about the plane to use for bouncing off are dead wrong. - // http://forum.zdoom.org/viewtopic.php?f=2&t=50449 - if (floordist <= ceildist) - { - vel = MulScale32 (self->velz, self->Sector->floorplane.c); - } - else - { - vel = MulScale32 (self->velz, self->Sector->ceilingplane.c); - } - if (vel < 2) + if (self->velz < 2*FRACUNIT) { goto boom; }