stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-17 10:11:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing a race condition forcing speed shoes captions to disappear almost instantly.

Browse source
This commit is contained in:
toasterbabe 2017-04-29 16:40:07 +01:00
parent b1d5bc3190
commit 22f5b67af6
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_enemy.c
View file

@ -3203,9 +3203,6 @@ void A_SuperSneakers(mobj_t *actor)
if (P_IsLocalPlayer(player) && !player->powers[pw_super]) if (P_IsLocalPlayer(player) && !player->powers[pw_super])
{ {
strlcpy(S_sfx[sfx_None].caption, "Speed shoes", 12);
S_StartCaption(sfx_None, -1, player->powers[pw_sneakers]);
if (S_SpeedMusic(0.0f) && (mapheaderinfo[gamemap-1]->levelflags & LF_SPEEDMUSIC)) if (S_SpeedMusic(0.0f) && (mapheaderinfo[gamemap-1]->levelflags & LF_SPEEDMUSIC))
S_SpeedMusic(1.4f); S_SpeedMusic(1.4f);
else else
@ -3213,6 +3210,8 @@ void A_SuperSneakers(mobj_t *actor)
S_StopMusic(); S_StopMusic();
S_ChangeMusicInternal("_shoes", false); S_ChangeMusicInternal("_shoes", false);
} }
strlcpy(S_sfx[sfx_None].caption, "Speed shoes", 12);
S_StartCaption(sfx_None, -1, player->powers[pw_sneakers]);
} }
} }