thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use font system for other string drawing functions

Browse source
This commit is contained in:
James R 2019-06-26 18:25:49 -07:00
parent d8a2d6c7e2
commit e04f8b2e53
1 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/v_video.c
View file

@ -1393,17 +1393,17 @@ void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed)
c -= HU_FONTSTART; c -= HU_FONTSTART;
else else
c = toupper(c) - HU_FONTSTART; c = toupper(c) - HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c]) if (c < 0 || c >= HU_FONTSIZE || !fontv[HU_FONT].font[c])
return; return;
w = SHORT(hu_font[c]->width); w = SHORT(fontv[HU_FONT].font[c]->width);
if (x + w > vid.width) if (x + w > vid.width)
return; return;
if (colormap != NULL) if (colormap != NULL)
V_DrawMappedPatch(x, y, flags, hu_font[c], colormap); V_DrawMappedPatch(x, y, flags, fontv[HU_FONT].font[c], colormap);
else else
V_DrawScaledPatch(x, y, flags, hu_font[c]); V_DrawScaledPatch(x, y, flags, fontv[HU_FONT].font[c]);
} }
// Writes a single character for the chat (half scaled). (draw WHITE if bit 7 set) // Writes a single character for the chat (half scaled). (draw WHITE if bit 7 set)
@ -1420,14 +1420,14 @@ void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed, UI
c -= HU_FONTSTART; c -= HU_FONTSTART;
else else
c = toupper(c) - HU_FONTSTART; c = toupper(c) - HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c]) if (c < 0 || c >= HU_FONTSIZE || !fontv[HU_FONT].font[c])
return; return;
w = SHORT(hu_font[c]->width)/2; w = SHORT(fontv[HU_FONT].font[c]->width)/2;
if (x + w > vid.width) if (x + w > vid.width)
return; return;
V_DrawFixedPatch(x*FRACUNIT, y*FRACUNIT, FRACUNIT/2, flags, hu_font[c], colormap); V_DrawFixedPatch(x*FRACUNIT, y*FRACUNIT, FRACUNIT/2, flags, fontv[HU_FONT].font[c], colormap);
} }
// Precompile a wordwrapped string to any given width. // Precompile a wordwrapped string to any given width.
@ -1478,13 +1478,13 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
c = toupper(c); c = toupper(c);
c -= HU_FONTSTART; c -= HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c]) if (c < 0 || c >= HU_FONTSIZE || !fontv[HU_FONT].font[c])
{ {
chw = spacewidth; chw = spacewidth;
lastusablespace = i; lastusablespace = i;
} }
else else
chw = (charwidth ? charwidth : hu_font[c]->width); chw = (charwidth ? charwidth : fontv[HU_FONT].font[c]->width);
x += chw; x += chw;
@ -1826,7 +1826,7 @@ void V_DrawRightAlignedThinString(INT32 x, INT32 y, INT32 option, const char *st
// Draws a tallnum. Replaces two functions in y_inter and st_stuff // Draws a tallnum. Replaces two functions in y_inter and st_stuff
void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num) void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num)
{ {
INT32 w = SHORT(tallnum[0]->width); INT32 w = SHORT(fontv[TALLNUM_FONT].font[0]->width);
boolean neg; boolean neg;
if (flags & V_NOSCALESTART) if (flags & V_NOSCALESTART)
@ -1839,7 +1839,7 @@ void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num)
do do
{ {
x -= w; x -= w;
V_DrawScaledPatch(x, y, flags, tallnum[num % 10]); V_DrawScaledPatch(x, y, flags, fontv[TALLNUM_FONT].font[num % 10]);
num /= 10; num /= 10;
} while (num); } while (num);
@ -1852,7 +1852,7 @@ void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num)
// Does not handle negative numbers in a special way, don't try to feed it any. // Does not handle negative numbers in a special way, don't try to feed it any.
void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits) void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
{ {
INT32 w = SHORT(tallnum[0]->width); INT32 w = SHORT(fontv[TALLNUM_FONT].font[0]->width);
if (flags & V_NOSCALESTART) if (flags & V_NOSCALESTART)
w *= vid.dupx; w *= vid.dupx;
@ -1864,7 +1864,7 @@ void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
do do
{ {
x -= w; x -= w;
V_DrawScaledPatch(x, y, flags, tallnum[num % 10]); V_DrawScaledPatch(x, y, flags, fontv[TALLNUM_FONT].font[num % 10]);
num /= 10; num /= 10;
} while (--digits); } while (--digits);
} }
@ -1874,7 +1874,7 @@ void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
void V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *colormap) void V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *colormap)
{ {
INT32 w = SHORT(pingnum[0]->width); // this SHOULD always be 5 but I guess custom graphics exist. INT32 w = SHORT(fontv[PINGNUM_FONT].font[0]->width); // this SHOULD always be 5 but I guess custom graphics exist.
if (flags & V_NOSCALESTART) if (flags & V_NOSCALESTART)
w *= vid.dupx; w *= vid.dupx;
@ -1886,7 +1886,7 @@ void V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *colorm
do do
{ {
x -= (w-1); // Oni wanted their outline to intersect. x -= (w-1); // Oni wanted their outline to intersect.
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, flags, pingnum[num%10], colormap); V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, flags, fontv[PINGNUM_FONT].font[num%10], colormap);
num /= 10; num /= 10;
} while (num); } while (num);
} }
@ -1908,7 +1908,7 @@ INT32 V_CreditStringWidth(const char *string)
if (c < 0 || c >= CRED_FONTSIZE) if (c < 0 || c >= CRED_FONTSIZE)
w += 16; w += 16;
else else
w += SHORT(cred_font[c]->width); w += SHORT(fontv[CRED_FONT].font[c]->width);
} }
return w; return w;
@ -1924,10 +1924,10 @@ INT32 V_LevelNameWidth(const char *string)
for (i = 0; i < strlen(string); i++) for (i = 0; i < strlen(string); i++)
{ {
c = toupper(string[i]) - LT_FONTSTART; c = toupper(string[i]) - LT_FONTSTART;
if (c < 0 || c >= LT_FONTSIZE || !lt_font[c]) if (c < 0 || c >= LT_FONTSIZE || !fontv[LT_FONT].font[c])
w += 12; w += 12;
else else
w += SHORT(lt_font[c]->width); w += SHORT(fontv[LT_FONT].font[c]->width);
} }
return w; return w;
@ -1943,11 +1943,11 @@ INT32 V_LevelNameHeight(const char *string)
for (i = 0; i < strlen(string); i++) for (i = 0; i < strlen(string); i++)
{ {
c = toupper(string[i]) - LT_FONTSTART; c = toupper(string[i]) - LT_FONTSTART;
if (c < 0 || c >= LT_FONTSIZE || !lt_font[c]) if (c < 0 || c >= LT_FONTSIZE || !fontv[LT_FONT].font[c])
continue; continue;
if (SHORT(lt_font[c]->height) > w) if (SHORT(fontv[LT_FONT].font[c]->height) > w)
w = SHORT(lt_font[c]->height); w = SHORT(fontv[LT_FONT].font[c]->height);
} }
return w; return w;
@ -1983,10 +1983,10 @@ INT32 V_StringWidth(const char *string, INT32 option)
continue; continue;
c = toupper(c) - HU_FONTSTART; c = toupper(c) - HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c]) if (c < 0 || c >= HU_FONTSIZE || !fontv[HU_FONT].font[c])
w += spacewidth; w += spacewidth;
else else
w += (charwidth ? charwidth : SHORT(hu_font[c]->width)); w += (charwidth ? charwidth : SHORT(fontv[HU_FONT].font[c]->width));
} }
return w; return w;
@ -2022,10 +2022,10 @@ INT32 V_SmallStringWidth(const char *string, INT32 option)
continue; continue;
c = toupper(c) - HU_FONTSTART; c = toupper(c) - HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c]) if (c < 0 || c >= HU_FONTSIZE || !fontv[HU_FONT].font[c])
w += spacewidth; w += spacewidth;
else else
w += (charwidth ? charwidth : SHORT(hu_font[c]->width)/2); w += (charwidth ? charwidth : SHORT(fontv[HU_FONT].font[c]->width)/2);
} }
return w; return w;
@ -2062,17 +2062,17 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
continue; continue;
if (!lowercase || !tny_font[c-HU_FONTSTART]) if (!lowercase || !fontv[TINY_FONT].font[c-HU_FONTSTART])
c = toupper(c); c = toupper(c);
c -= HU_FONTSTART; c -= HU_FONTSTART;
if (c < 0 || c >= HU_FONTSIZE || !tny_font[c]) if (c < 0 || c >= HU_FONTSIZE || !fontv[TINY_FONT].font[c])
w += spacewidth; w += spacewidth;
else else
{ {
w += (charwidth ? charwidth w += (charwidth ? charwidth
: ((option & V_6WIDTHSPACE && i < strlen(string)-1) ? max(1, SHORT(tny_font[c]->width)-1) // Reuse this flag for the alternate bunched-up spacing : ((option & V_6WIDTHSPACE && i < strlen(string)-1) ? max(1, SHORT(fontv[TINY_FONT].font[c]->width)-1) // Reuse this flag for the alternate bunched-up spacing
: SHORT(tny_font[c]->width))); : SHORT(fontv[TINY_FONT].font[c]->width)));
} }
} }