incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use musicdef from main.pk3 instead.

Browse source
This commit is contained in:
NepDisk 2025-03-12 14:44:26 -04:00
parent 1f6e8f25cd
commit f1c27ff963
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/s_sound.c
View file

@ -25,6 +25,7 @@
#include "w_wad.h" #include "w_wad.h"
#include "z_zone.h" #include "z_zone.h"
#include "d_main.h" #include "d_main.h"
#include "d_netfil.h"
#include "r_sky.h" // skyflatnum #include "r_sky.h" // skyflatnum
#include "p_local.h" // camera info #include "p_local.h" // camera info
#include "fastcmp.h" #include "fastcmp.h"
@ -1664,8 +1665,17 @@ void S_LoadMusicDefs(UINT16 wad)
void S_InitMusicDefs(void) void S_InitMusicDefs(void)
{ {
UINT16 i; UINT16 i;
char *tempname;
for (i = 0; i < numwadfiles; i++) for (i = 0; i < numwadfiles; i++)
{ {
nameonly(tempname = va("%s", wadfiles[i]->filename));
if (wadfiles[i]->filename && !stricmp(tempname, "music.kart"))
{
// Awful hack but what can you do?
continue;
}
S_LoadMusicDefs(i); S_LoadMusicDefs(i);
} }
} }
@ -1738,10 +1748,10 @@ void S_ShowMusicCredit(void)
}\ }\
} }
MUSICCREDITAPPEND(def->author, true); MUSICCREDITAPPEND(def->author, false);
MUSICCREDITAPPEND(def->source, false); MUSICCREDITAPPEND(def->source, true);
#undef MUSICCREDITAPPEND //#undef MUSICCREDITAPPEND
} }
if (credittext[0] == '\0') if (credittext[0] == '\0')