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

Merge pull request 'Improve rival and local player nametags' (#86) from Wumbo/blankart:nametags into blankart-dev

Browse source 
Reviewed-on: https://codeberg.org/NepDisk/blankart/pulls/86
This commit is contained in:
NepDisk 2025-09-04 15:52:28 +02:00
commit faf3eb582e
2 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_hud.c
View file

@ -3182,16 +3182,16 @@ static boolean K_ShowPlayerNametag(player_t *p)
static void K_DrawLocalTagForPlayer(fixed_t x, fixed_t y, player_t *p, UINT8 id)
{
UINT16 chatcolor = skincolors[p->skincolor].chatcolor;
char letters[4] = {'A', 'B', 'C', 'D'};
V_DrawCenteredSmallStringAtFixed(x, y, V_HUDTRANS|V_ALLOWLOWERCASE|V_SPLITSCREEN|chatcolor, va("%c\nv", letters[id]));
V_DrawCenteredSmallStringAtFixed(x, y, V_HUDTRANS|V_SPLITSCREEN|chatcolor, va("P%d", id+1));
}
static void K_DrawRivalTagForPlayer(fixed_t x, fixed_t y)
{
UINT16 chatcolor = skincolors[SKINCOLOR_ORANGE].chatcolor;
UINT8 blinkstates[4] = {SKINCOLOR_RED, SKINCOLOR_ORANGE, SKINCOLOR_YELLOW, SKINCOLOR_ORANGE};
UINT16 chatcolor = skincolors[blinkstates[(leveltime / 3) % 4]].chatcolor;
V_DrawCenteredSmallStringAtFixed(x, y, V_HUDTRANS|V_ALLOWLOWERCASE|V_SPLITSCREEN|chatcolor, "Rival\n v");
V_DrawCenteredSmallStringAtFixed(x, y, V_HUDTRANS|V_SPLITSCREEN|chatcolor, "RIVAL");
}
static const char *K_StringTypingDot(player_t *p)
@ -3521,7 +3521,7 @@ static void K_drawKartNameTags(void)
}
}
if (localindicator >= 0)
if (cv_seenames.value && localindicator >= 0)
{
K_DrawLocalTagForPlayer(result.x, result.y, ntplayer, localindicator);
}

43
src/v_video.c
View file

@ -3388,7 +3388,7 @@ INT32 V_LevelNameHeight(const char *string)
//
INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option)
{
INT32 c, w = 0;
INT32 c, w = 0, lw = 0;
INT32 spacewidth = 4, charwidth = 0;
ssize_t i;
@ -3412,15 +3412,23 @@ INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option)
for (i = 0; string[i] && i < length; i++)
{
c = string[i];
if (c == '\n') {
w = max(w, lw); // width is based on widest line of text
lw = 0;
continue;
}
if ((UINT8)c & 0x80) //color parsing! -Inuyasha 2.16.09
continue;
c = toupper(c) - HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !fontv[HU_FONT].font[c])
w += spacewidth;
lw += spacewidth;
else
w += (charwidth ? charwidth : fontv[HU_FONT].font[c]->width);
lw += (charwidth ? charwidth : fontv[HU_FONT].font[c]->width);
}
w = max(w, lw);
if (option & (V_NOSCALESTART|V_NOSCALEPATCH))
w *= vid.dupx;
@ -3433,7 +3441,7 @@ INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option)
//
INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option)
{
INT32 c, w = 0;
INT32 c, w = 0, lw = 0;
INT32 spacewidth = 2, charwidth = 0;
ssize_t i;
@ -3457,15 +3465,23 @@ INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option)
for (i = 0; string[i] && i < length; i++)
{
c = string[i];
if (c == '\n') {
w = max(w, lw); // width is based on widest line of text
lw = 0;
continue;
}
if ((UINT8)c & 0x80) //color parsing! -Inuyasha 2.16.09
continue;
c = toupper(c) - HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !fontv[HU_FONT].font[c])
w += spacewidth;
lw += spacewidth;
else
w += (charwidth ? charwidth : fontv[HU_FONT].font[c]->width / 2);
lw += (charwidth ? charwidth : fontv[HU_FONT].font[c]->width / 2);
}
w = max(w, lw);
return w;
}
@ -3475,7 +3491,7 @@ INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option)
//
INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option)
{
INT32 c, w = 0;
INT32 c, w = 0, lw = 0;
INT32 spacewidth = 2, charwidth = 0;
boolean lowercase = (option & V_ALLOWLOWERCASE);
ssize_t i;
@ -3501,6 +3517,13 @@ INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option)
for (i = 0; string[i] && i < length; i++)
{
c = string[i];
if (c == '\n') {
w = max(w, lw); // width is based on widest line of text
lw = 0;
continue;
}
if ((UINT8)c & 0x80) //color parsing! -Inuyasha 2.16.09
continue;
@ -3509,15 +3532,15 @@ INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option)
c -= HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !fontv[TINY_FONT].font[c])
w += spacewidth;
lw += spacewidth;
else
{
w += (charwidth ? charwidth
lw += (charwidth ? charwidth
: ((option & V_6WIDTHSPACE && i < (ssize_t)strlen(string)-1) ? max(1, fontv[TINY_FONT].font[c]->width-1) // Reuse this flag for the alternate bunched-up spacing
: fontv[TINY_FONT].font[c]->width));
}
}
w = max(w, lw);
return w;
}