work around encore music again

S_InitMapMusic would play before the level actually started thus playing a smol bit of non encore music in encore
This commit is contained in:
Alug committed 2024-09-30 16:27:56 +02:00
1 parent 5f1dfecd18
commit c6de3040fb
1 file changed
+5 -7
+5 -7
View File
@@ -2059,17 +2059,13 @@ void S_InitMapMusic(void)
if (keepmusic)
return;
if (cv_skipintromusic.value)
{
S_StopMusic();
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
return;
}
// Starting ambience should always be restarted
// lug: but not when we keep the map music lol
S_StopMusic();
if (cv_skipintromusic.value)
return;
if (leveltime < starttime) // SRB2Kart
S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); //S_StopMusic();
//S_ChangeMusicEx((encoremode ? "estart" : "kstart"), 0, false, mapmusposition, 0, 0);
@@ -2090,6 +2086,8 @@ void S_StartMapMusic(void)
if (cv_skipintromusic.value)
{
if (leveltime == 0)
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
if (leveltime == (starttime + (TICRATE/2)))
S_ShowMusicCredit();
return;