From a595f2369cd185089fec294d9e225bf2bd92cd8c Mon Sep 17 00:00:00 2001 From: Inuyasha Date: Thu, 12 May 2016 13:52:41 -0700 Subject: [PATCH] fix infinite bounce rings --- src/p_inter.c | 4 ++-- src/p_mobj.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 7809d6c59..b12437bc1 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2494,7 +2494,7 @@ static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *sou if (!(inflictor->flags & MF_FIRE)) P_GivePlayerRings(player, 1); if (inflictor->flags2 & MF2_BOUNCERING) - inflictor->fuse = 1; + inflictor->fuse = 0; // bounce ring disappears at -1 not 0 return false; } @@ -2577,7 +2577,7 @@ static inline boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj if (!(inflictor->flags & MF_FIRE)) P_GivePlayerRings(target->player, 1); if (inflictor->flags2 & MF2_BOUNCERING) - inflictor->fuse = 1; + inflictor->fuse = 0; // bounce ring disappears at -1 not 0 return false; } diff --git a/src/p_mobj.c b/src/p_mobj.c index bcbb72c42..7171a5b84 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1712,7 +1712,7 @@ void P_XYMovement(mobj_t *mo) mo->threshold++; // Gain lower amounts of time on each bounce. - if (mo->threshold < 5) + if (mo->fuse && mo->threshold < 5) mo->fuse += ((5 - mo->threshold) * TICRATE); // Check for hit against sky here @@ -2185,7 +2185,7 @@ static boolean P_ZMovement(mobj_t *mo) // Be sure to change the XY one too if you change this. // Gain lower amounts of time on each bounce. - if (mo->threshold < 5) + if (mo->fuse && mo->threshold < 5) mo->fuse += ((5 - mo->threshold) * TICRATE); } break;