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

Add Menu Font (without using it anywhere)

Browse source 
Content of commit was originally written by Sal, but as a monolithic commit. The author of this commit is chunking it up for easier review.

Adds the additional font. This requires a little cleanup before we can use it as the primary menu font, but worth at least putting this in the relevant places for later.
This commit is contained in:
toaster 2023-07-09 20:56:25 +01:00
parent a536f884ce
commit 86784ae91a
4 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hu_stuff.c
View file

@ -255,6 +255,10 @@ void HU_Init(void)
PR ("STCFN"); PR ("STCFN");
REG; REG;
PR ("MNUFN");
REG;
PR ("TNYFN"); PR ("TNYFN");
REG; REG;

1
src/hu_stuff.h
View file

@ -67,6 +67,7 @@ extern "C" {
enum enum
{ {
X (HU), X (HU),
X (MENU),
X (TINY), X (TINY),
X (FILE), X (FILE),

16
src/v_video.cpp
View file

@ -2291,6 +2291,7 @@ void V_DrawStringScaled(
{ {
default: default:
case HU_FONT: case HU_FONT:
case MENU_FONT:
spacew = 4; spacew = 4;
switch (spacing) switch (spacing)
{ {
@ -2361,6 +2362,7 @@ void V_DrawStringScaled(
{ {
default: default:
case HU_FONT: case HU_FONT:
case MENU_FONT:
case TINY_FONT: case TINY_FONT:
case KART_FONT: case KART_FONT:
lfh = 12; lfh = 12;
@ -2603,6 +2605,7 @@ fixed_t V_StringScaledWidth(
{ {
default: default:
case HU_FONT: case HU_FONT:
case MENU_FONT:
spacew = 4; spacew = 4;
switch (spacing) switch (spacing)
{ {
@ -2671,6 +2674,7 @@ fixed_t V_StringScaledWidth(
{ {
default: default:
case HU_FONT: case HU_FONT:
case MENU_FONT:
case TINY_FONT: case TINY_FONT:
case KART_FONT: case KART_FONT:
lfh = 12; lfh = 12;
@ -2913,6 +2917,18 @@ void V_DrawRightAlignedTimerString(INT32 x, INT32 y, INT32 option, const char *s
V_DrawTimerString(x, y, option, string); V_DrawTimerString(x, y, option, string);
} }
void V_DrawCenteredMenuString(INT32 x, INT32 y, INT32 option, const char *string)
{
x -= V_MenuStringWidth(string, option)/2;
V_DrawMenuString(x, y, option, string);
}
void V_DrawRightAlignedMenuString(INT32 x, INT32 y, INT32 option, const char *string)
{
x -= V_MenuStringWidth(string, option);
V_DrawMenuString(x, y, option, string);
}
void V_DrawCenteredGamemodeString(INT32 x, INT32 y, INT32 option, const UINT8 *colormap, const char *string) void V_DrawCenteredGamemodeString(INT32 x, INT32 y, INT32 option, const UINT8 *colormap, const char *string)
{ {
x -= V_GamemodeStringWidth(string, option)/2; x -= V_GamemodeStringWidth(string, option)/2;

9
src/v_video.h
View file

@ -374,6 +374,15 @@ void V_DrawProfileNum(INT32 x, INT32 y, INT32 flags, UINT8 num);
void V_DrawCenteredTimerString(INT32 x, INT32 y, INT32 option, const char *string); void V_DrawCenteredTimerString(INT32 x, INT32 y, INT32 option, const char *string);
void V_DrawRightAlignedTimerString(INT32 x, INT32 y, INT32 option, const char *string); void V_DrawRightAlignedTimerString(INT32 x, INT32 y, INT32 option, const char *string);
#define V_DrawMenuString( x,y,option,string ) \
V__DrawDupxString (x,y,FRACUNIT,option,NULL,MENU_FONT,string)
#define V_MenuStringWidth( string,option ) \
V__IntegerStringWidth ( FRACUNIT,option,MENU_FONT,string )
void V_DrawCenteredMenuString(INT32 x, INT32 y, INT32 option, const char *string);
void V_DrawRightAlignedMenuString(INT32 x, INT32 y, INT32 option, const char *string);
#define V_DrawGamemodeString( x,y,option,cm,string ) \ #define V_DrawGamemodeString( x,y,option,cm,string ) \
V__DrawDupxString (x,y,FRACUNIT,option,cm,GM_FONT,string) V__DrawDupxString (x,y,FRACUNIT,option,cm,GM_FONT,string)