From 71ccf7c9685c65727df3a53df996ab2a6156dbb5 Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sun, 3 Mar 2024 19:29:48 -0700 Subject: [PATCH] Fix out-of-bounds hitlag sounds --- src/k_hitlag.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/k_hitlag.c b/src/k_hitlag.c index 5a81cfd5a..5b40ac9cd 100644 --- a/src/k_hitlag.c +++ b/src/k_hitlag.c @@ -20,6 +20,7 @@ #include "p_local.h" #include "r_main.h" #include "s_sound.h" +#include "m_easing.h" /*-------------------------------------------------- void K_AddHitLag(mobj_t *mo, INT32 tics, boolean fromDamage) @@ -152,7 +153,11 @@ static void K_PlayHitLagSFX(mobj_t *victim, UINT8 tics) soundID = sfx_dmgb1; } - soundID += ((tics * (NUM_HITLAG_SOUNDS - 1)) + (MAXHITLAGTICS >> 1)) / MAXHITLAGTICS; + soundID += Easing_Linear( + min(FRACUNIT, FRACUNIT*tics/MAXHITLAGTICS), + 0, + NUM_HITLAG_SOUNDS-1 + ); S_StartSound(victim, soundID); }