From 9017ca1c2020a794cab5f31f0d8ebc0aa813b51d Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 14 Dec 2022 02:21:41 -0800 Subject: [PATCH] Delay mine explosion sound until after Broly ki --- src/info.c | 2 +- src/k_kart.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/info.c b/src/info.c index 4c45490e5..5a1cefa1f 100644 --- a/src/info.c +++ b/src/info.c @@ -5145,7 +5145,7 @@ state_t states[NUMSTATES] = // Broly Ki Orb {SPR_LSSJ, FF_REVERSESUBTRACT|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_BROLY2}, // S_BROLY1 - {SPR_NULL, 0, 1, {A_SSMineFlash}, 0, 0, S_NULL}, // S_BROLY2 + {SPR_NULL, 0, 5*TICRATE, {A_SSMineFlash}, 0, 0, S_NULL}, // S_BROLY2 }; mobjinfo_t mobjinfo[NUMMOBJTYPES] = diff --git a/src/k_kart.c b/src/k_kart.c index d72cb30f1..0ed21875c 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5100,6 +5100,8 @@ void K_MineFlashScreen(mobj_t *source) INT32 pnum; player_t *p; + S_StartSound(source, sfx_s3k4e); + // check for potential display players near the source so we can have a sick earthquake / flashpal. for (pnum = 0; pnum < MAXPLAYERS; pnum++) { @@ -5136,8 +5138,6 @@ void K_SpawnMineExplosion(mobj_t *source, UINT8 color, tic_t delay) radius = source->radius>>FRACBITS; height = source->height>>FRACBITS; - S_StartSound(smoldering, sfx_s3k4e); - if (!color) color = SKINCOLOR_KETCHUP;