From 5da6739077891ef70d8fac5f5d4b551303f6df10 Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 28 Aug 2023 13:56:19 +0300 Subject: [PATCH] Don't play slam sound too often --- src/k_kart.c | 8 +++++++- src/p_mobj.c | 3 +++ src/p_mobj.h | 2 ++ src/p_saveg.c | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index c6d4397ce..b1866e684 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3001,8 +3001,14 @@ static void K_StretchPlayerGravity(player_t *p) I_Assert(p->mo != NULL); I_Assert(!P_MobjWasRemoved(p->mo)); - if (cv_slamsound.value == 1 && (p->mo->eflags & MFE_JUSTHITFLOOR) && p->mo->stretchslam > 4*mos) + if (p->mo->slamsoundtimer) + p->mo->slamsoundtimer--; + + if (cv_slamsound.value == 1 && (p->mo->eflags & MFE_JUSTHITFLOOR) && p->mo->stretchslam > 4*mos && !p->mo->slamsoundtimer) + { S_StartSound(p->mo, sfx_s3k4c); + p->mo->slamsoundtimer = TICRATE; + } if (!P_IsObjectOnGround(p->mo)) { diff --git a/src/p_mobj.c b/src/p_mobj.c index f29a63f43..090f83290 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9564,6 +9564,9 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) mobj->spriteyscale = mobj->realyscale; mobj->spritexoffset = mobj->spriteyoffset = 0; + // Funni slam sound when landing + mobj->slamsoundtimer = 0; + // set subsector and/or block links P_SetThingPosition(mobj); I_Assert(mobj->subsector != NULL); diff --git a/src/p_mobj.h b/src/p_mobj.h index 872c9dd5e..adb8b6196 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -394,6 +394,8 @@ typedef struct mobj_s boolean colorized; // Whether the mobj uses the rainbow colormap boolean rollmodel; // OpenGL: Should this model rotate? + tic_t slamsoundtimer; + // WARNING: New fields must be added separately to savegame and Lua. } mobj_t; diff --git a/src/p_saveg.c b/src/p_saveg.c index 673f1cb40..bc836b6e5 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -1984,6 +1984,7 @@ static void LoadMobjThinker(actionf_p1 thinker) mobj->spritexscale = mobj->spriteyscale = mobj->old_spritexscale = mobj->old_spriteyscale = FRACUNIT; mobj->realxscale = mobj->realyscale = FRACUNIT; mobj->stretchslam = 0; + mobj->slamsoundtimer = 0; mobj->sloperoll = mobj->reservezangle = mobj->reservexydir = 0;