thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'always-musicdef-author' into 'master'

Browse source 
Always show author on song credit (resolves #1332)

Closes #1332

See merge request KartKrew/Kart!2333
This commit is contained in:
Oni 2024-05-02 02:45:10 +00:00
commit 7bb49a9f67
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_menudraw.c
View file

@ -8833,7 +8833,16 @@ void M_DrawSoundTest(void)
if (soundtest.current->source) if (soundtest.current->source)
V_DrawThinString(x+1, (y += 10), 0, soundtest.current->source); V_DrawThinString(x+1, (y += 10), 0, soundtest.current->source);
if (soundtest.current->composers) if (soundtest.current->composers)
V_DrawThinString(x+1, (y += 10), 0, soundtest.current->composers); {
char *wrappedcomposers = V_ScaledWordWrap(
(BASEVIDWIDTH - ((x+1)*2)) << FRACBITS,
FRACUNIT, FRACUNIT, FRACUNIT,
0, TINY_FONT,
soundtest.current->composers
);
V_DrawThinString(x+1, (y += 10), 0, wrappedcomposers);
Z_Free(wrappedcomposers);
}
} }
else else
{ {

8
src/s_sound.c
View file

@ -2204,7 +2204,7 @@ void S_LoadMusicCredit(void)
widthused -= V_ThinStringWidth(credittext, 0); widthused -= V_ThinStringWidth(credittext, 0);
#define MUSICCREDITAPPEND(field)\ #define MUSICCREDITAPPEND(field, force)\
if (field)\ if (field)\
{\ {\
work = va(" - %s", field);\ work = va(" - %s", field);\
@ -2212,7 +2212,7 @@ void S_LoadMusicCredit(void)
if (worklen <= len)\ if (worklen <= len)\
{\ {\
workwidth = V_ThinStringWidth(work, 0);\ workwidth = V_ThinStringWidth(work, 0);\
if (widthused >= workwidth)\ if (force || widthused >= workwidth)\
{\ {\
strncat(credittext, work, len);\ strncat(credittext, work, len);\
len -= worklen;\ len -= worklen;\
@ -2221,8 +2221,8 @@ void S_LoadMusicCredit(void)
}\ }\
} }
MUSICCREDITAPPEND(def->author); MUSICCREDITAPPEND(def->author, true);
MUSICCREDITAPPEND(def->source); MUSICCREDITAPPEND(def->source, false);
#undef MUSICCREDITAPPEND #undef MUSICCREDITAPPEND
} }