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

Sound credits no longer go off the screen

Browse source 
Uses V_ThinStringWidth to check whether it'd exceed BASEVIDWIDTH.
Does not apply to the main song title - if that exceeds the width of the screen, just visibly fail.
This commit is contained in:
toaster 2023-04-03 21:10:09 +01:00
parent 37c1a40da6
commit 2e687b4033
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/s_sound.c
View file

@ -34,6 +34,7 @@
#include "k_menu.h" // M_PlayMenuJam #include "k_menu.h" // M_PlayMenuJam
#include "m_random.h" // P_RandomKey #include "m_random.h" // P_RandomKey
#include "i_time.h" #include "i_time.h"
#include "v_video.h" // V_ThinStringWidth
#ifdef HW3SOUND #ifdef HW3SOUND
// 3D Sound Interface // 3D Sound Interface
@ -2079,6 +2080,7 @@ void S_ShowMusicCredit(void)
char credittext[128] = ""; char credittext[128] = "";
char *work = NULL; char *work = NULL;
size_t len = 128, worklen; size_t len = 128, worklen;
INT32 widthused = BASEVIDWIDTH, workwidth;
if (!cv_songcredits.value || S_PlaysimMusicDisabled()) if (!cv_songcredits.value || S_PlaysimMusicDisabled())
return; return;
@ -2109,6 +2111,8 @@ void S_ShowMusicCredit(void)
} }
} }
widthused -= V_ThinStringWidth(credittext, V_ALLOWLOWERCASE|V_6WIDTHSPACE);
#define MUSICCREDITAPPEND(field)\ #define MUSICCREDITAPPEND(field)\
if (field)\ if (field)\
{\ {\
@ -2116,8 +2120,13 @@ void S_ShowMusicCredit(void)
worklen = strlen(work);\ worklen = strlen(work);\
if (worklen <= len)\ if (worklen <= len)\
{\ {\
strncat(credittext, work, len);\ workwidth = V_ThinStringWidth(work, V_ALLOWLOWERCASE|V_6WIDTHSPACE);\
len -= worklen;\ if (widthused >= workwidth)\
{\
strncat(credittext, work, len);\
len -= worklen;\
widthused -= workwidth;\
}\
}\ }\
} }