From 06af7f9e338b346ef66bb1fc8614af80ac466e2c Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Thu, 4 Nov 2021 22:49:53 +0100 Subject: [PATCH] Use Font_GetID() in the places where drawfont is used. --- src/client/hud.qc | 2 +- src/client/obituary.qc | 2 +- src/client/scoreboard.qc | 8 ++++---- zpak001.pk3dir/fonts/chat.font | 2 ++ zpak001.pk3dir/fonts/font16.font | 5 ++--- zpak001.pk3dir/fonts/font20.font | 5 ++--- zpak001.pk3dir/fonts/fontcon.font | 5 ++--- 7 files changed, 14 insertions(+), 15 deletions(-) create mode 100644 zpak001.pk3dir/fonts/chat.font diff --git a/src/client/hud.qc b/src/client/hud.qc index 43b85f6..ca8726f 100644 --- a/src/client/hud.qc +++ b/src/client/hud.qc @@ -443,7 +443,7 @@ HUD_DrawSpectator(void) spectator spec = (spectator)pSeat->m_ePlayer; - drawfont = FONT_20; + drawfont = Font_GetID(FONT_20); vector vecPos; string strText; diff --git a/src/client/obituary.qc b/src/client/obituary.qc index ea61f79..78dc03b 100644 --- a/src/client/obituary.qc +++ b/src/client/obituary.qc @@ -147,7 +147,7 @@ Obituary_Draw(void) int i; vector pos; vector item; - drawfont = FONT_CON; + drawfont = Font_GetID(FONT_CON); pos = g_hudmins + [g_hudres[0] - 18, 56]; if (g_obituary_time <= 0 && g_obituary_count > 0) { diff --git a/src/client/scoreboard.qc b/src/client/scoreboard.qc index 6fe48c7..bf509a6 100644 --- a/src/client/scoreboard.qc +++ b/src/client/scoreboard.qc @@ -31,7 +31,7 @@ Scores_DrawTeam(player pl, vector pos) { drawfill(pos, [290, 1], SCORE_LINE_C, 1.0f, DRAWFLAG_ADDITIVE); - drawfont = FONT_20; + drawfont = Font_GetID(FONT_20); drawstring(pos + [0,-18], "Teams", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE); drawstring(pos + [124,-18], "kills / deaths", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE); drawstring(pos + [240,-18], "latency", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE); @@ -97,7 +97,7 @@ Scores_DrawTeam(player pl, vector pos) pos[1] += 12; } - drawfont = FONT_CON; + drawfont = Font_GetID(FONT_CON); } void @@ -105,7 +105,7 @@ Scores_DrawNormal(player pl, vector pos) { drawfill(pos, [290, 1], SCORE_LINE_C, 1.0f, DRAWFLAG_ADDITIVE); - drawfont = FONT_20; + drawfont = Font_GetID(FONT_20); drawstring(pos + [0,-18], "Player", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE); drawstring(pos + [124,-18], "kills / deaths", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE); drawstring(pos + [240,-18], "latency", [20,20], SCORE_HEADER_C, 1.0f, DRAWFLAG_ADDITIVE); @@ -151,7 +151,7 @@ Scores_DrawNormal(player pl, vector pos) pos[1] += 20; } - drawfont = FONT_CON; + drawfont = Font_GetID(FONT_CON); } void diff --git a/zpak001.pk3dir/fonts/chat.font b/zpak001.pk3dir/fonts/chat.font new file mode 100644 index 0000000..1a4da0b --- /dev/null +++ b/zpak001.pk3dir/fonts/chat.font @@ -0,0 +1,2 @@ +path "CONCHARS?fmt=h" +size 12 diff --git a/zpak001.pk3dir/fonts/font16.font b/zpak001.pk3dir/fonts/font16.font index 090643d..893f3b7 100644 --- a/zpak001.pk3dir/fonts/font16.font +++ b/zpak001.pk3dir/fonts/font16.font @@ -1,3 +1,2 @@ -name "16" -font "fonts/default" -size "16" +path fonts/default +size 16 diff --git a/zpak001.pk3dir/fonts/font20.font b/zpak001.pk3dir/fonts/font20.font index f34fc24..e0c8397 100644 --- a/zpak001.pk3dir/fonts/font20.font +++ b/zpak001.pk3dir/fonts/font20.font @@ -1,3 +1,2 @@ -name "cr" -font "creditsfont?fmt=h" -size "20" +path "creditsfont?fmt=h" +size 20 \ No newline at end of file diff --git a/zpak001.pk3dir/fonts/fontcon.font b/zpak001.pk3dir/fonts/fontcon.font index 7d90c16..1a4da0b 100644 --- a/zpak001.pk3dir/fonts/fontcon.font +++ b/zpak001.pk3dir/fonts/fontcon.font @@ -1,3 +1,2 @@ -name "font" -font "" -size "12" +path "CONCHARS?fmt=h" +size 12