From 49d99e3a31e8ffde7a00a0ec2cd1cb54041f2fa9 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 13 Apr 2021 04:28:41 -0400 Subject: [PATCH 1/2] 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); From 7167b163780f105a04627fb03db08794ca09fb34 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Tue, 13 Apr 2021 04:31:38 -0400 Subject: [PATCH 2/2] Update mace sound flags - SF_X2AWAYSOUND to hear them farther away - SF_TOTALLYSINGLE cuz it makes fast maces sound cool --- src/sounds.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sounds.c b/src/sounds.c index dc777a088..fa0229aa2 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -87,7 +87,7 @@ sfxinfo_t S_sfx[NUMSFX] = {"fire", false, 8, 32, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"}, {"grind", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic grinding"}, {"laser", true, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Laser hum"}, - {"mswing", false, 16, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging mace"}, + {"mswing", false, 16, 65, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging mace"}, {"pstart", false, 100, 0, -1, NULL, 0, -1, -1, LUMPERROR, "/"}, {"pstop", false, 100, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crusher stomp"}, {"steam1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Steam jet"}, // Tails 06-19-2001 @@ -630,8 +630,8 @@ sfxinfo_t S_sfx[NUMSFX] = {"s3kc7l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Aiming"}, // ditto {"s3kc8s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding"}, {"s3kc8l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Sliding"}, // ditto - {"s3kc9s", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, - {"s3kc9l", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, // ditto + {"s3kc9s", false, 64, 65, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, + {"s3kc9l", false, 64, 65, -1, NULL, 0, -1, -1, LUMPERROR, "Swinging"}, // ditto {"s3kcas", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, {"s3kcal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Energy"}, // ditto {"s3kcbs", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous rumbling"},