diff --git a/src/p_enemy.c b/src/p_enemy.c index 18d37a1a7d1f8bc42418fb276ce32136d3dc577a..b60e5e68b2df8b65e751fb8dec0d5f0bab76763f 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -4152,9 +4152,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 a69bd5b9372063b2ba4cea98eb5920283a010399..58ba00fc94390314fa95213ef7bf96b45fd98d7d 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); } } diff --git a/src/s_sound.c b/src/s_sound.c index 1c6cd5ef1a4d6e18419c436f250258aa3c923427..3068db1dfca2b4252b4e722480c3d918179cede5 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1783,12 +1783,12 @@ static lumpnum_t S_GetMusicLumpNum(const char *mname) return W_GetNumForName(va("d_%s", mname)); else if (S_DigMusicDisabled() && S_DigExists(mname)) { - CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n"); + //CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n"); return LUMPERROR; } else if (S_MIDIMusicDisabled() && S_MIDIExists(mname)) { - CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n"); + //CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n"); return LUMPERROR; } else