From 22f5b67af6a913b06e93daf85db7955e2c4694c4 Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 29 Apr 2017 16:40:07 +0100
Subject: [PATCH] Fixing a race condition forcing speed shoes captions to
disappear almost instantly.
---
src/p_enemy.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/p_enemy.c b/src/p_enemy.c
index c03b033623..d4d6064e34 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -3203,9 +3203,6 @@ void A_SuperSneakers(mobj_t *actor)
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))
S_SpeedMusic(1.4f);
else
@@ -3213,6 +3210,8 @@ void A_SuperSneakers(mobj_t *actor)
S_StopMusic();
S_ChangeMusicInternal("_shoes", false);
}
+ strlcpy(S_sfx[sfx_None].caption, "Speed shoes", 12);
+ S_StartCaption(sfx_None, -1, player->powers[pw_sneakers]);
}
}
--
GitLab