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

Music test from Saturn Pt2: I got it to stop crashing lmao

Browse source 
It was conflicting with the musicdef backwards compat and tried using Source when it doesn't exist.
This commit is contained in:
NepDisk 2025-03-14 11:43:59 -04:00
parent a17aec9d37
commit d60322311f
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/m_menu.c
View file

@ -6831,12 +6831,12 @@ static void M_DrawMusicTest(void)
V_DrawString(x, 10, 0, "NOW PLAYING:"); V_DrawString(x, 10, 0, "NOW PLAYING:");
if (curplaying) if (curplaying)
{ {
if (curplaying->title && curplaying->title[0]) if (curplaying->source && curplaying->source[0] && curplaying->title && curplaying->title[0])
titl = va("%s - %s - ", curplaying->title, curplaying->source);
else if (curplaying->title && curplaying->title[0])
titl = va("%s - ", curplaying->title); titl = va("%s - ", curplaying->title);
else if (curplaying->title && curplaying->source[0])
titl = va("%s - ", curplaying->source);
else else
titl = va("%s - ", "What did you do......."); titl = va("%s - ", "No Title - ");
} }
else else
titl = "NONE - "; titl = "NONE - ";
@ -6930,9 +6930,9 @@ static void M_DrawMusicTest(void)
const size_t MAXLENGTH = 34; const size_t MAXLENGTH = 34;
const tic_t SCROLLSPEED = TICRATE/5; // Number of tics for name being scrolled by 1 letter const tic_t SCROLLSPEED = TICRATE/5; // Number of tics for name being scrolled by 1 letter
size_t nameoffset = 0; size_t nameoffset = 0;
size_t namelength = soundtestdefs[t]->source ? strlen(soundtestdefs[t]->source) : 0; size_t namelength = soundtestdefs[t]->title ? strlen(soundtestdefs[t]->title) : 8; // "No Title"
if (soundtestdefs[t]->title && (soundtestdefs[t]->title[0])) if (soundtestdefs[t]->source && (soundtestdefs[t]->source[0]))
namelength = strlen(soundtestdefs[t]->title); namelength = strlen(va("%s - %s ", soundtestdefs[t]->title, soundtestdefs[t]->source));
char buf[MAXLENGTH+1]; char buf[MAXLENGTH+1];
@ -6994,12 +6994,13 @@ static void M_DrawMusicTest(void)
} }
} }
if (soundtestdefs[t]->title && soundtestdefs[t]->title[0]) if (soundtestdefs[t]->title && soundtestdefs[t]->title[0]
&& soundtestdefs[t]->source && soundtestdefs[t]->source[0])
strncpy(buf, va("%s - %s",soundtestdefs[t]->title, soundtestdefs[t]->source) + nameoffset, MAXLENGTH);
else if (soundtestdefs[t]->title && soundtestdefs[t]->title[0])
strncpy(buf, soundtestdefs[t]->title + nameoffset, MAXLENGTH); strncpy(buf, soundtestdefs[t]->title + nameoffset, MAXLENGTH);
else if (soundtestdefs[t]->source && soundtestdefs[t]->source[0])
strncpy(buf, soundtestdefs[t]->source + nameoffset, MAXLENGTH);
else else
strncpy(buf, "How tf did you get here?", MAXLENGTH); strncpy(buf, "No Title or Source", MAXLENGTH);
buf[MAXLENGTH] = 0; buf[MAXLENGTH] = 0;
V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf); V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf);