Fix S_ChangeMusic newmusic -> mmusic, merge error

This commit is contained in:
mazmazz 2018-08-26 14:22:14 -04:00
parent 768ce1a46f
commit 73b4c4c5b4

View file

@ -1494,7 +1494,7 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping)
return;
}
if (strnicmp(music_name, newmusic, 6))
if (strnicmp(music_name, mmusic, 6))
{
S_StopMusic(); // shutdown old music