Add Medium Font

Monospaced in-between of Console & Thin
This commit is contained in:
Sally Coolatta 2024-01-27 20:38:52 -05:00
parent f4db29574d
commit a7df7aa637
6 changed files with 21 additions and 6 deletions

View file

@ -267,13 +267,15 @@ void HU_Init(void)
PR ("STCFN"); PR ("STCFN");
REG; REG;
PR ("MNUFN"); PR ("MNUFN");
REG; REG;
PR ("TNYFN"); PR ("TNYFN");
REG; REG;
PR ("MDFN");
REG;
PR ("FILEF"); PR ("FILEF");
REG; REG;

View file

@ -69,6 +69,7 @@ enum
X (HU), X (HU),
X (MENU), X (MENU),
X (TINY), X (TINY),
X (MED),
X (FILE), X (FILE),
X (LT), X (LT),

View file

@ -865,16 +865,16 @@ static void Y_DrawVoteSelection(fixed_t offset)
); );
size_t ci; size_t ci;
for (ci = 0; ci < 10; ci++) for (ci = 0; ci < 12; ci++)
{ {
const size_t c = (ci + charAnim) % vote_draw.levels[i].str_len; const size_t c = (ci + charAnim) % vote_draw.levels[i].str_len;
V_DrawCharacterScaled( V_DrawCharacterScaled(
(fx + (7 * dupx * ci)) << FRACBITS, (fx + (6 * dupx * ci)) << FRACBITS,
(fy - fh + (2 * dupy)) << FRACBITS, (fy - fh + dupy) << FRACBITS,
FRACUNIT, FRACUNIT,
V_ORANGEMAP | V_NOSCALESTART, V_ORANGEMAP | V_FORCEUPPERCASE | V_NOSCALESTART,
HU_FONT, MED_FONT,
vote_draw.levels[i].str[c], vote_draw.levels[i].str[c],
NULL NULL
); );

View file

@ -175,6 +175,9 @@ int Draw::font_to_fontno(Font font)
case Font::kMenu: case Font::kMenu:
return MENU_FONT; return MENU_FONT;
case Font::kMedium:
return MED_FONT;
} }
return TINY_FONT; return TINY_FONT;

View file

@ -38,6 +38,7 @@ public:
kPing, kPing,
kTimer, kTimer,
kMenu, kMenu,
kMedium,
}; };
enum class Align enum class Align

View file

@ -2285,6 +2285,10 @@ static void V_GetFontSpecification(int fontno, INT32 flags, fontspec_t *result)
break; break;
} }
break; break;
case MED_FONT:
result->chw = 6;
result->spacew = 6;
break;
case LT_FONT: case LT_FONT:
result->spacew = 12; result->spacew = 12;
break; break;
@ -2330,6 +2334,7 @@ static void V_GetFontSpecification(int fontno, INT32 flags, fontspec_t *result)
case MENU_FONT: case MENU_FONT:
case TINY_FONT: case TINY_FONT:
case KART_FONT: case KART_FONT:
case MED_FONT:
result->lfh = 12; result->lfh = 12;
break; break;
case LT_FONT: case LT_FONT:
@ -2384,6 +2389,9 @@ static void V_GetFontSpecification(int fontno, INT32 flags, fontspec_t *result)
else else
result->dim_fn = BunchedCharacterDim; result->dim_fn = BunchedCharacterDim;
break; break;
case MED_FONT:
result->dim_fn = FixedCharacterDim;
break;
case GM_FONT: case GM_FONT:
if (result->chw) if (result->chw)
result->dim_fn = FixedCharacterDim; result->dim_fn = FixedCharacterDim;