From f9317b265e01e866f3c1933595d829f1a607ce1f Mon Sep 17 00:00:00 2001 From: Lach <54614944+lachablock@users.noreply.github.com> Date: Tue, 20 Sep 2022 22:28:20 +1000 Subject: [PATCH] Correct Ring Shooter countdown --- src/p_mobj.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 07b5840be..fbdf33252 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -1878,7 +1878,7 @@ void P_XYMovement(mobj_t *mo) FIXED_TO_FLOAT(AngleFixed(oldangle-newangle)) ); */ - + } else if (predictedz - mo->z > abs(slopemom.z / 2)) { @@ -4657,11 +4657,8 @@ static void P_RingShooterCountdown(mobj_t *mo) if (mo->reactiontime == -1) return; - if (mo->reactiontime > 0) - { - mo->reactiontime--; + if (--mo->reactiontime > 0) return; - } while (!P_MobjWasRemoved(part->tracer)) { @@ -10563,7 +10560,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) if (type == MT_NULL) { -#if 0 +#if 0 #ifdef PARANOIA I_Error("Tried to spawn MT_NULL\n"); #endif