From 49d99e3a31e8ffde7a00a0ec2cd1cb54041f2fa9 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 13 Apr 2021 04:28:41 -0400 Subject: [PATCH] Do the spinning mace sound every half spin, instead of every full swing This matches how Marble Garden maces worked in Sonic 3 more closely, and also just makes it plain easier to hear them in a fast-paced race. --- src/p_mobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 49165162d..40edac8df 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -4319,8 +4319,8 @@ void P_MaceRotate(mobj_t *center, INT32 baserot, INT32 baseprevrot) angle_t prevfa = (prevrot + mobj->friction) & FINEMASK; fa = (rot + mobj->friction) & FINEMASK; - if (!(prevfa > (FINEMASK/2)) && (fa > (FINEMASK/2))) // completed a full swing - dosound = true; + // completed a half-spin + dosound = ((prevfa > (FINEMASK/2)) != (fa > (FINEMASK/2))); unit_lengthways[0] = FixedMul(FINECOSINE(fa), radius); unit_lengthways[2] = FixedMul(FINESINE(fa), radius);