mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-12-17 16:30:51 +00:00
Merge branch 'musicplus-core' into musicplus-feature-postboss
This commit is contained in:
commit
c82a5de4b7
1 changed files with 1 additions and 5 deletions
|
@ -1562,10 +1562,6 @@ void S_ChangeMusicAdvanced(const char *mmusic, UINT16 mflags, boolean looping, U
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
newmusic[6] = 0;
|
newmusic[6] = 0;
|
||||||
int i;
|
|
||||||
for (i = 0; newmusic[i]; i++) {
|
|
||||||
newmusic[i] = tolower(newmusic[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// No Music (empty string)
|
// No Music (empty string)
|
||||||
if (newmusic[0] == 0)
|
if (newmusic[0] == 0)
|
||||||
|
@ -1584,7 +1580,7 @@ void S_ChangeMusicAdvanced(const char *mmusic, UINT16 mflags, boolean looping, U
|
||||||
I_FadeSong(0, prefadems, S_ChangeMusicToQueue);
|
I_FadeSong(0, prefadems, S_ChangeMusicToQueue);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (strncmp(music_name, newmusic, 6) || (mflags & MUSIC_FORCERESET))
|
else if (strnicmp(music_name, newmusic, 6) || (mflags & MUSIC_FORCERESET))
|
||||||
{
|
{
|
||||||
CONS_Debug(DBG_DETAILED, "Now playing song %s\n", newmusic);
|
CONS_Debug(DBG_DETAILED, "Now playing song %s\n", newmusic);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue