From 9208a7233f4d49a4eae4edd2880b312d815666a0 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 27 Aug 2023 11:13:47 +0300 Subject: [PATCH] Redo slamsound using MFE_JUSTHITFLOOR --- src/k_kart.c | 8 ++------ src/p_mobj.c | 2 -- src/p_mobj.h | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 7de4cfaae..6b5769776 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -3000,8 +3000,8 @@ static void K_StretchPlayerGravity(player_t *p) I_Assert(p != NULL); I_Assert(p->mo != NULL); I_Assert(!P_MobjWasRemoved(p->mo)); - - if (!p->mo->stretchonground && P_IsObjectOnGround(p->mo) && (cv_slamsound.value == 1)) + + if (p->mo->eflags & MFE_JUSTHITFLOOR && (cv_slamsound.value == 1)) S_StartSound(p->mo, sfx_s3k4c); if (!P_IsObjectOnGround(p->mo)) @@ -3022,7 +3022,6 @@ static void K_StretchPlayerGravity(player_t *p) { p->mo->spritexscale = (dxs); p->mo->spriteyscale = (dys); - p->mo->stretchonground = false; } } else @@ -3037,10 +3036,7 @@ static void K_StretchPlayerGravity(player_t *p) p->mo->stretchslam -= (4*mos); else p->mo->stretchslam = 0; - p->mo->stretchonground = true; } - - } static INT32 K_FindPlayerNum(player_t *plyr) diff --git a/src/p_mobj.c b/src/p_mobj.c index bd561c034..f29a63f43 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9563,8 +9563,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type) mobj->spritexscale = mobj->realxscale; mobj->spriteyscale = mobj->realyscale; mobj->spritexoffset = mobj->spriteyoffset = 0; - - mobj->stretchonground = true; // set subsector and/or block links P_SetThingPosition(mobj); diff --git a/src/p_mobj.h b/src/p_mobj.h index 42d2bae07..872c9dd5e 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -394,8 +394,6 @@ typedef struct mobj_s boolean colorized; // Whether the mobj uses the rainbow colormap boolean rollmodel; // OpenGL: Should this model rotate? - boolean stretchonground; // Play funni sound when player lands on ground with stretch - // WARNING: New fields must be added separately to savegame and Lua. } mobj_t;