Merge branch 'itallreturnstonothing' into 'next'

Handle empty music lump name on music change

See merge request STJr/SRB2!2090
This commit is contained in:
Sal 2023-08-02 15:24:42 +00:00
commit 0ce41f3e1d

View file

@ -2561,11 +2561,13 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
// Change the music and apply position/fade operations
else
{
if (!line->stringargs[0])
break;
strncpy(mapmusname, line->stringargs[0], 7);
mapmusname[6] = 0;
if (!line->stringargs[0] || !strcmp(line->stringargs[0], "-"))
strcpy(mapmusname, "");
else
{
strncpy(mapmusname, line->stringargs[0], 7);
mapmusname[6] = 0;
}
mapmusflags = tracknum & MUSIC_TRACKMASK;
if (!(line->args[0] & TMM_NORELOAD))