Compare commits

...
Author SHA1 Message Date
Alug 2049353647 move this out of maptitle condition
it does not rely on it and may even fail
idk why i threw it in there
2025-07-27 15:11:07 +02:00
2 changed files with 10 additions and 8 deletions

No files matched your search

+9 -8
View File
@@ -2010,7 +2010,7 @@ void S_KeepMusic(void)
}
// Sets up the map music in case it should be reloaded
// Special case for keep music
// Special case for keepmusic
void S_HandleReloadResetMusic(void)
{
if (!(mapmusic.flags & MUSIC_RELOADRESET))
@@ -2035,23 +2035,24 @@ void S_HandleReloadResetMusic(void)
static boolean S_SkipIntroMusic(void)
{
boolean skip = cv_skipintromusic.value;
if (!cv_skipintromusic.value)
return false;
if (!skip)
// check if menu music is playing, otherwise it may continue playing
if (!stricmp(music.name, "titles"))
return false;
char *maptitle = G_BuildMapTitle(gamemap); // Zzz...
if (maptitle)
if (maptitle && !stricmp(maptitle, "Wandering Falls")) // wandering balls changes its song when the race starts Zzz...
{
// check if menu music is playing, otherwise it may continue playing
if (!stricmp(music.name, "titles") || (maptitle && (!stricmp(maptitle, "Wandering Falls")))) // wandering balls changes its song when the race starts Zzz...
skip = false;
Z_Free(maptitle);
return false;
}
Z_Free(maptitle);
return skip;
return true;
}
//
+1
View File
@@ -1037,6 +1037,7 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean
S_sfx[i].data = I_GetSfx(&S_sfx[i]);
else
S_sfx[i].data = NULL;
return i;
}
}