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

Merge branch 'tunes-show-credit' into 'master'

Browse source 
Print musicdef along with tunes -show

See merge request KartKrew/Kart!854
This commit is contained in:
James R 2023-01-06 02:03:35 +00:00 committed by NepDisk
parent dc84a294cb
commit a4b073a76b
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/s_sound.c
View file

@ -2445,6 +2445,28 @@ void S_StartEx(boolean reset)
music_stack_fadein = JINGLEPOSTFADE;
}
static inline void PrintMusicDefField(const char *label, const char *field)
{
if (field)
{
CONS_Printf("%s%s\n", label, field);
}
}
static void PrintSongAuthors(const musicdef_t *def)
{
CONS_Printf("Volume: %d/100\n\n", def->volume);
PrintMusicDefField("Title: ", def->title);
PrintMusicDefField("Author: ", def->author);
CONS_Printf("\n");
PrintMusicDefField("Original Source: ", def->source);
PrintMusicDefField("Original Composers: ", def->composers);
}
// TODO: fix this function, needs better support for map names
static void Command_Tunes_f(void)
{
const char *tunearg;
@ -2468,8 +2490,15 @@ static void Command_Tunes_f(void)
if (!strcasecmp(tunearg, "-show"))
{
const musicdef_t *def = S_FindMusicDef(mapmusname);
CONS_Printf(M_GetText("The current tune is: %s [track %d]\n"),
mapmusname, (mapmusflags & MUSIC_TRACKMASK));
if (def != NULL)
{
PrintSongAuthors(def);
}
return;
}
if (!strcasecmp(tunearg, "-none"))