Compare commits
1
Commits
fastcmpstuff
...
v8.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2049353647 |
No files matched your search
+9
-8
@@ -2010,7 +2010,7 @@ void S_KeepMusic(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Sets up the map music in case it should be reloaded
|
// Sets up the map music in case it should be reloaded
|
||||||
// Special case for keep music
|
// Special case for keepmusic
|
||||||
void S_HandleReloadResetMusic(void)
|
void S_HandleReloadResetMusic(void)
|
||||||
{
|
{
|
||||||
if (!(mapmusic.flags & MUSIC_RELOADRESET))
|
if (!(mapmusic.flags & MUSIC_RELOADRESET))
|
||||||
@@ -2035,23 +2035,24 @@ void S_HandleReloadResetMusic(void)
|
|||||||
|
|
||||||
static boolean S_SkipIntroMusic(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;
|
return false;
|
||||||
|
|
||||||
char *maptitle = G_BuildMapTitle(gamemap); // Zzz...
|
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
|
Z_Free(maptitle);
|
||||||
if (!stricmp(music.name, "titles") || (maptitle && (!stricmp(maptitle, "Wandering Falls")))) // wandering balls changes its song when the race starts Zzz...
|
return false;
|
||||||
skip = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Z_Free(maptitle);
|
Z_Free(maptitle);
|
||||||
|
|
||||||
return skip;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -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]);
|
S_sfx[i].data = I_GetSfx(&S_sfx[i]);
|
||||||
else
|
else
|
||||||
S_sfx[i].data = NULL;
|
S_sfx[i].data = NULL;
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user