From fc458128cf2247788b140a186c64ec7ceb17f0d3 Mon Sep 17 00:00:00 2001 From: alufolie91 Date: Tue, 28 Nov 2023 11:42:46 +0100 Subject: [PATCH] show file of where the music comes from + toggle ty indev c: --- src/d_netcmd.c | 1 + src/m_menu.c | 7 ++++++- src/m_menu.h | 1 + src/s_sound.c | 2 ++ src/s_sound.h | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 67b875617..cd9f1af24 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1122,6 +1122,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_lastserver); CV_RegisterVar(&cv_showallmaps); + CV_RegisterVar(&cv_showmusicfilename); // ingame object placing COM_AddCommand("objectplace", Command_ObjectPlace_f); diff --git a/src/m_menu.c b/src/m_menu.c index d83d1ba34..1a8cc57ce 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -470,7 +470,9 @@ CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1]; consvar_t cv_newgametype = {"newgametype", "Race", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_showallmaps = {"showallmaps", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL }; +consvar_t cv_showallmaps = {"showallmaps", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; + +consvar_t cv_showmusicfilename = {"showmusicfilename", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t serversort_cons_t[] = { {0,"Ping"}, @@ -8235,6 +8237,9 @@ static void M_DrawMusicTest(void) V_DrawString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_ALLOWLOWERCASE, va("%.6s", curplaying->name)); else V_DrawString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_ALLOWLOWERCASE, va("%.6s - %.255s\n", curplaying->name, curplaying->usage)); + + if (cv_showmusicfilename.value) + V_DrawSmallString(0, 0, V_SNAPTOTOP|V_SNAPTOLEFT|V_ALLOWLOWERCASE, curplaying->filename); } } diff --git a/src/m_menu.h b/src/m_menu.h index d8726623b..e3b042294 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -245,6 +245,7 @@ extern description_t description[MAXSKINS]; extern consvar_t cv_showfocuslost; extern consvar_t cv_newgametype, cv_nextmap, cv_chooseskin, cv_serversort; extern consvar_t cv_showallmaps; +extern consvar_t cv_showmusicfilename; extern CV_PossibleValue_t gametype_cons_t[]; extern char dummystaffname[22]; diff --git a/src/s_sound.c b/src/s_sound.c index 93d65aecd..d622f724d 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1417,6 +1417,8 @@ void S_LoadMusicDefs(UINT16 wadnum) //CONS_Printf("S_LoadMusicDefs: Added song '%s'\n", def->name); } } + + strncpy(def->filename, wadfiles[wadnum]->filename, 256); skip_lump: stoken = strtok(NULL, "\r\n "); diff --git a/src/s_sound.h b/src/s_sound.h index 15ff9b250..44267bc21 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -147,6 +147,7 @@ typedef struct musicdef_s char name[7]; char usage[256]; char source[256]; + char filename[256]; struct musicdef_s *next; } musicdef_t;