From 7ff1a4455d22c02aab5d61a07d44d05cad3d44c2 Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 3 Jun 2019 14:57:58 -0700 Subject: [PATCH] Begin using the font system --- src/hu_stuff.c | 4 ++-- src/st_stuff.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hu_stuff.c b/src/hu_stuff.c index a2b8721aa..68773b7bb 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -838,7 +838,7 @@ static inline boolean HU_keyInChatString(char *s, char ch) { size_t l; - if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART]) + if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && fontv[HU_FONT].font[ch-HU_FONTSTART]) || ch == ' ') // Allow spaces, of course { l = strlen(s); @@ -1288,7 +1288,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string) c = toupper(c); 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; lastusablespace = i; diff --git a/src/st_stuff.h b/src/st_stuff.h index 4ea307d2b..052cd79c5 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -71,7 +71,6 @@ extern INT32 st_translucency; extern lumpnum_t st_borderpatchnum; // patches, also used in intermission -extern patch_t *tallnum[10]; extern patch_t *sboscore; extern patch_t *sbotime; extern patch_t *sbocolon;