From a617563bd88c762f1579ad23fcf95c0a4d1eafb9 Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 9 Dec 2021 17:44:23 -0800 Subject: [PATCH] Add gasp sfx when exiting water, but not with bubble shield --- src/p_mobj.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 5a9f0925e..9550b0c41 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -3059,7 +3059,16 @@ void P_MobjCheckWater(mobj_t *mobj) return; // The rest of this code only executes on a water state change. - if (waterwasnotset || !!(mobj->eflags & MFE_UNDERWATER) == wasinwater) + if (!!(mobj->eflags & MFE_UNDERWATER) == wasinwater) + return; + + if (p && !p->waterskip && + p->curshield != KSHIELD_BUBBLE && wasinwater) + { + S_StartSound(mobj, sfx_gasp); + } + + if (waterwasnotset) return; if ((p) // Players