lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations).

This commit is contained in:
toaster 2019-09-07 11:48:58 +01:00
parent 4c39225c3e
commit 54b89eefbb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_enemy.c
View File

@ -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);
}
}

2
src/p_user.c
View File

@ -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);
}
}