From 54b89eefbb700261a670875fcd77a63fa9e0838f Mon Sep 17 00:00:00 2001 From: toaster Date: Sat, 7 Sep 2019 11:48:58 +0100 Subject: [PATCH] * Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations). --- src/p_enemy.c | 2 +- src/p_user.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index e3f169784..0129000fc 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -4149,9 +4149,9 @@ void A_Invincibility(mobj_t *actor) { if (mariomode) G_GhostAddColor(GHC_INVINCIBLE); + P_PlayJingle(player, (mariomode) ? JT_MINV : JT_INV); strlcpy(S_sfx[sfx_None].caption, "Invincibility", 14); S_StartCaption(sfx_None, -1, player->powers[pw_invulnerability]); - P_PlayJingle(player, (mariomode) ? JT_MINV : JT_INV); } } diff --git a/src/p_user.c b/src/p_user.c index a69bd5b93..58ba00fc9 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -1431,11 +1431,11 @@ void P_PlayLivesJingle(player_t *player) S_StartSound(NULL, sfx_marioa); else { + P_PlayJingle(player, JT_1UP); if (player) player->powers[pw_extralife] = extralifetics + 1; strlcpy(S_sfx[sfx_None].caption, "One-up", 7); S_StartCaption(sfx_None, -1, extralifetics+1); - P_PlayJingle(player, JT_1UP); } }