Merge remote-tracking branch 'origin/iwantmychat' into nametags

src/CMakeLists.txt

@@ -18,6 +18,7 @@ set(SRB2_CORE_SOURCES
 	g_game.c
 	g_input.c
 	g_splitscreen.c
+	font.c
 	hu_stuff.c
 	i_tcp.c
 	info.c
@@ -73,6 +74,7 @@ set(SRB2_CORE_HEADERS
 	g_game.h
 	g_input.h
 	g_state.h
+	font.h
 	hu_stuff.h
 	i_joy.h
 	i_net.h

src/Makefile

@@ -502,6 +502,7 @@ OBJS:=$(i_main_o) \
 		$(OBJDIR)/am_map.o   \
 		$(OBJDIR)/command.o  \
 		$(OBJDIR)/console.o  \
+		$(OBJDIR)/font.o     \
 		$(OBJDIR)/hu_stuff.o \
 		$(OBJDIR)/y_inter.o  \
 		$(OBJDIR)/st_stuff.o \
@@ -813,7 +814,7 @@ $(OBJDIR)/v_video.o: v_video.c doomdef.h doomtype.h g_state.h m_swap.h r_local.h
   tables.h m_fixed.h screen.h command.h m_bbox.h r_main.h d_player.h \
   p_pspr.h info.h d_think.h sounds.h p_mobj.h doomdata.h d_ticcmd.h \
   r_data.h r_defs.h r_state.h r_bsp.h r_segs.h r_plane.h r_sky.h \
-  r_things.h r_draw.h v_video.h hu_stuff.h d_event.h w_wad.h console.h \
+  r_things.h r_draw.h v_video.h font.h hu_stuff.h d_event.h w_wad.h console.h \
   i_video.h z_zone.h doomstat.h d_clisrv.h d_netcmd.h
 	$(CC) $(CFLAGS) -fno-omit-frame-pointer $(WFLAGS) -c $< -o $@
 endif

src/font.c

@@ -0,0 +1,77 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1999-2018 by Sonic Team Junior.
+// Copyright (C)      2019 by Kart Krew.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  font.c
+/// \brief Font setup
+
+#include "doomdef.h"
+#include "hu_stuff.h"
+#include "font.h"
+#include "z_zone.h"
+
+font_t       fontv[MAX_FONTS];
+int          fontc;
+
+static void
+FontCache (font_t *fnt)
+{
+	int i;
+	int c;
+
+	c = fnt->start;
+	for (i = 0; i < fnt->size; ++i, ++c)
+	{
+		fnt->font[i] = HU_CachePatch(
+				"%s%.*d",
+				fnt->prefix,
+				fnt->digits,
+				c);
+	}
+}
+
+void
+Font_Load (void)
+{
+	int i;
+	for (i = 0; i < fontc; ++i)
+	{
+		FontCache(&fontv[i]);
+	}
+}
+
+int
+Font_DumbRegister (const font_t *sfnt)
+{
+	font_t *fnt;
+
+	if (fontc == MAX_FONTS)
+		return -1;
+
+	fnt = &fontv[fontc];
+
+	memcpy(fnt, sfnt, sizeof (font_t));
+
+	if (!( fnt->font = ZZ_Alloc(sfnt->size * sizeof (patch_t *)) ))
+		return -1;
+
+	return fontc++;
+}
+
+int
+Font_Register (const font_t *sfnt)
+{
+	int d;
+
+	d = Font_DumbRegister(sfnt);
+
+	if (d >= 0)
+		FontCache(&fontv[d]);
+
+	return d;
+}

src/font.h

@@ -0,0 +1,49 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1999-2018 by Sonic Team Junior.
+// Copyright (C)      2019 by Kart Krew.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  font.h
+/// \brief Font setup
+
+#ifndef __FONT_H__
+#define __FONT_H__
+
+#define MAX_FONTS 32
+
+typedef struct font font_t;
+
+struct font
+{
+	patch_t **font;
+
+	UINT8     start;
+	UINT8     size;
+
+	char      prefix[8];/* 7 used at most */
+	unsigned  digits : 2;
+};
+
+extern font_t fontv[MAX_FONTS];
+extern int    fontc;
+
+/*
+Reloads already registered fonts.
+*/
+void Font_Load (void);
+
+/*
+Registers and loads a new font.
+*/
+int Font_Register     (const font_t *);
+
+/*
+Register a new font, but do not load it yet.
+*/
+int Font_DumbRegister (const font_t *);
+
+#endif

src/g_game.c

@@ -8107,7 +8107,7 @@ boolean G_DemoTitleResponder(event_t *ev)
 		return true;
 	}
 
-	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
 	{
 		len = strlen(demo.titlename);

src/hu_stuff.c

@@ -14,6 +14,7 @@
 #include "doomdef.h"
 #include "byteptr.h"
 #include "hu_stuff.h"
+#include "font.h"
 
 #include "m_menu.h" // gametype_cons_t
 #include "m_cond.h" // emblems
@@ -64,19 +65,9 @@
 //-------------------------------------------
 //              heads up font
 //-------------------------------------------
-patch_t *hu_font[HU_FONTSIZE];
-patch_t *kart_font[KART_FONTSIZE];	// SRB2kart
-patch_t *tny_font[HU_FONTSIZE];
-patch_t *tallnum[10]; // 0-9
-patch_t *nightsnum[10]; // 0-9
-
-// Level title and credits fonts
-patch_t *lt_font[LT_FONTSIZE];
-patch_t *cred_font[CRED_FONTSIZE];
 
 // ping font
 // Note: I'd like to adress that at this point we might *REALLY* want to work towards a common drawString function that can take any font we want because this is really turning into a MESS. :V -Lat'
-patch_t *pingnum[10];
 patch_t *pinggfx[5];	// small ping graphic
 patch_t *mping[5]; // smaller ping graphic
 
@@ -188,137 +179,53 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum);
 
 void HU_LoadGraphics(void)
 {
-	char buffer[9];
+	INT32 i;
-	INT32 i, j;
 
 	if (dedicated)
 		return;
 
-	j = HU_FONTSTART;
+	Font_Load();
-	for (i = 0; i < HU_FONTSIZE; i++, j++)
-	{
-		// cache the heads-up font for entire game execution
-		sprintf(buffer, "STCFN%.3d", j);
-		if (W_CheckNumForName(buffer) == LUMPERROR)
-			hu_font[i] = NULL;
-		else
-			hu_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-
-		// tiny version of the heads-up font
-		sprintf(buffer, "TNYFN%.3d", j);
-		if (W_CheckNumForName(buffer) == LUMPERROR)
-			tny_font[i] = NULL;
-		else
-			tny_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-	}
-
-	// cache the level title font for entire game execution
-	lt_font[0] = (patch_t *)W_CachePatchName("LTFNT039", PU_HUDGFX); /// \note fake start hack
-
-	// Number support
-	lt_font[9] = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX);
-	lt_font[10] = (patch_t *)W_CachePatchName("LTFNT049", PU_HUDGFX);
-	lt_font[11] = (patch_t *)W_CachePatchName("LTFNT050", PU_HUDGFX);
-	lt_font[12] = (patch_t *)W_CachePatchName("LTFNT051", PU_HUDGFX);
-	lt_font[13] = (patch_t *)W_CachePatchName("LTFNT052", PU_HUDGFX);
-	lt_font[14] = (patch_t *)W_CachePatchName("LTFNT053", PU_HUDGFX);
-	lt_font[15] = (patch_t *)W_CachePatchName("LTFNT054", PU_HUDGFX);
-	lt_font[16] = (patch_t *)W_CachePatchName("LTFNT055", PU_HUDGFX);
-	lt_font[17] = (patch_t *)W_CachePatchName("LTFNT056", PU_HUDGFX);
-	lt_font[18] = (patch_t *)W_CachePatchName("LTFNT057", PU_HUDGFX);
-
-	// SRB2kart
-	j = KART_FONTSTART;
-	for (i = 0; i < KART_FONTSIZE; i++, j++)
-	{
-		// cache the heads-up font for entire game execution
-		sprintf(buffer, "MKFNT%.3d", j);
-		if (W_CheckNumForName(buffer) == LUMPERROR)
-			kart_font[i] = NULL;
-		else
-			kart_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-	}
-	//
-
-	j = LT_FONTSTART;
-	for (i = 0; i < LT_FONTSIZE; i++)
-	{
-		sprintf(buffer, "LTFNT%.3d", j);
-		j++;
-
-		if (W_CheckNumForName(buffer) == LUMPERROR)
-			lt_font[i] = NULL;
-		else
-			lt_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-	}
-
-	// cache the credits font for entire game execution (why not?)
-	j = CRED_FONTSTART;
-	for (i = 0; i < CRED_FONTSIZE; i++)
-	{
-		sprintf(buffer, "CRFNT%.3d", j);
-		j++;
-
-		if (W_CheckNumForName(buffer) == LUMPERROR)
-			cred_font[i] = NULL;
-		else
-			cred_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-	}
-
-	//cache numbers too!
-	for (i = 0; i < 10; i++)
-	{
-		sprintf(buffer, "STTNUM%d", i);
-		tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-		sprintf(buffer, "NGTNUM%d", i);
-		nightsnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
-		sprintf(buffer, "PINGN%d", i);
-		pingnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
-	}
 
 	// minus for negative tallnums
-	tallminus = (patch_t *)W_CachePatchName("STTMINUS", PU_HUDGFX);
+	tallminus          = HU_CachePatch("STTMINUS");
 
 	// cache the crosshairs, don't bother to know which one is being used,
 	// just cache all 3, they're so small anyway.
 	for (i = 0; i < HU_CROSSHAIRS; i++)
 	{
-		sprintf(buffer, "CROSHAI%c", '1'+i);
+		crosshair[i]    = HU_CachePatch("CROSHAI%c", '1'+i);
-		crosshair[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
-	emblemicon = W_CachePatchName("EMBLICON", PU_HUDGFX);
+	emblemicon         = HU_CachePatch("EMBLICON");
-	tokenicon = W_CachePatchName("TOKNICON", PU_HUDGFX);
+	tokenicon          = HU_CachePatch("TOKNICON");
 
-	emeraldpics[0] = W_CachePatchName("CHAOS1", PU_HUDGFX);
+	emeraldpics[0]     = HU_CachePatch("CHAOS1");
-	emeraldpics[1] = W_CachePatchName("CHAOS2", PU_HUDGFX);
+	emeraldpics[1]     = HU_CachePatch("CHAOS2");
-	emeraldpics[2] = W_CachePatchName("CHAOS3", PU_HUDGFX);
+	emeraldpics[2]     = HU_CachePatch("CHAOS3");
-	emeraldpics[3] = W_CachePatchName("CHAOS4", PU_HUDGFX);
+	emeraldpics[3]     = HU_CachePatch("CHAOS4");
-	emeraldpics[4] = W_CachePatchName("CHAOS5", PU_HUDGFX);
+	emeraldpics[4]     = HU_CachePatch("CHAOS5");
-	emeraldpics[5] = W_CachePatchName("CHAOS6", PU_HUDGFX);
+	emeraldpics[5]     = HU_CachePatch("CHAOS6");
-	emeraldpics[6] = W_CachePatchName("CHAOS7", PU_HUDGFX);
+	emeraldpics[6]     = HU_CachePatch("CHAOS7");
-	tinyemeraldpics[0] = W_CachePatchName("TEMER1", PU_HUDGFX);
+	tinyemeraldpics[0] = HU_CachePatch("TEMER1");
-	tinyemeraldpics[1] = W_CachePatchName("TEMER2", PU_HUDGFX);
+	tinyemeraldpics[1] = HU_CachePatch("TEMER2");
-	tinyemeraldpics[2] = W_CachePatchName("TEMER3", PU_HUDGFX);
+	tinyemeraldpics[2] = HU_CachePatch("TEMER3");
-	tinyemeraldpics[3] = W_CachePatchName("TEMER4", PU_HUDGFX);
+	tinyemeraldpics[3] = HU_CachePatch("TEMER4");
-	tinyemeraldpics[4] = W_CachePatchName("TEMER5", PU_HUDGFX);
+	tinyemeraldpics[4] = HU_CachePatch("TEMER5");
-	tinyemeraldpics[5] = W_CachePatchName("TEMER6", PU_HUDGFX);
+	tinyemeraldpics[5] = HU_CachePatch("TEMER6");
-	tinyemeraldpics[6] = W_CachePatchName("TEMER7", PU_HUDGFX);
+	tinyemeraldpics[6] = HU_CachePatch("TEMER7");
 
-	songcreditbg = W_CachePatchName("K_SONGCR", PU_HUDGFX);
+	songcreditbg       = HU_CachePatch("K_SONGCR");
 
 	// cache ping gfx:
 	for (i = 0; i < 5; i++)
 	{
-		sprintf(buffer, "PINGGFX%d", i+1);
+		pinggfx[i] = HU_CachePatch("PINGGFX%d", i+1);
-		pinggfx[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+		mping[i] = HU_CachePatch("MPING%d", i+1);
-		sprintf(buffer, "MPING%d", i+1);
-		mping[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
 	}
 
 	// fps stuff
-	framecounter = W_CachePatchName("FRAMER", PU_HUDGFX);
+	framecounter       = HU_CachePatch("FRAMER");
-	frameslash  = W_CachePatchName("FRAMESL", PU_HUDGFX);;
+	frameslash         = HU_CachePatch("FRAMESL");;
 }
 
 // Initialise Heads up
@@ -326,6 +233,8 @@ void HU_LoadGraphics(void)
 //
 void HU_Init(void)
 {
+	font_t font;
+
 #ifndef NONET
 	COM_AddCommand("say", Command_Say_f);
 	COM_AddCommand("sayto", Command_Sayto_f);
@@ -337,9 +246,78 @@ void HU_Init(void)
 	// set shift translation table
 	shiftxform = english_shiftxform;
 
+	/*
+	Setup fonts
+	*/
+
+	if (!dedicated)
+	{
+#define  DIM( s, n ) ( font.start = s, font.size = n )
+#define ADIM( name )        DIM (name ## _FONTSTART, name ## _FONTSIZE)
+#define   PR( s )           strcpy(font.prefix, s)
+#define  DIG( n )           ( font.digits = n )
+#define  REG                Font_DumbRegister(&font)
+
+		DIG  (3);
+
+		ADIM (HU);
+
+		PR   ("STCFN");
+		REG;
+
+		PR   ("TNYFN");
+		REG;
+
+		ADIM (KART);
+		PR   ("MKFNT");
+		REG;
+
+		ADIM (LT);
+		PR   ("LTFNT");
+		REG;
+
+		ADIM (CRED);
+		PR   ("CRFNT");
+		REG;
+
+		DIG  (1);
+
+		DIM  (0, 10);
+
+		PR   ("STTNUM");
+		REG;
+
+		PR   ("NGTNUM");
+		REG;
+
+		PR   ("PINGN");
+		REG;
+
+#undef  REG
+#undef  DIG
+#undef  PR
+#undef  ADMIN
+#undef  DIM
+	}
+
 	HU_LoadGraphics();
 }
 
+patch_t *HU_CachePatch(const char *format, ...)
+{
+	va_list ap;
+	char buffer[9];
+
+	va_start (ap, format);
+	vsprintf(buffer, format, ap);
+	va_end   (ap);
+
+	if (W_CheckNumForName(buffer) == LUMPERROR)
+		return NULL;
+	else
+		return (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+}
+
 static inline void HU_Stop(void)
 {
 	headsupactive = false;
@@ -999,7 +977,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);
@@ -1433,7 +1411,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;

src/hu_stuff.h

@@ -17,6 +17,7 @@
 #include "d_event.h"
 #include "w_wad.h"
 #include "r_defs.h"
+#include "font.h"
 
 //------------------------------------
 //           heads up font
@@ -42,6 +43,23 @@
 #define CRED_FONTEND 'Z' // the last font character
 #define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1)
 
+#define X( name ) name ## _FONT
+/* fonts */
+enum
+{
+	X        (HU),
+	X      (TINY),
+	X      (KART),
+
+	X        (LT),
+	X      (CRED),
+
+	X   (TALLNUM),
+	X (NIGHTSNUM),
+	X   (PINGNUM),
+};
+#undef  X
+
 #define HU_CROSSHAIRS 3 // maximum of 9 - see HU_Init();
 
 extern char *shiftxform; // english translation shift table
@@ -78,15 +96,9 @@ void HU_AddChatText(const char *text, boolean playsound);
 // set true when entering a chat message
 extern boolean chat_on;
 
-extern patch_t *hu_font[HU_FONTSIZE], *kart_font[KART_FONTSIZE], *tny_font[HU_FONTSIZE];	// SRB2kart
-extern patch_t *tallnum[10];
-extern patch_t *pingnum[10];
 extern patch_t *pinggfx[5];
-extern patch_t *nightsnum[10];
 extern patch_t *framecounter;
 extern patch_t *frameslash;
-extern patch_t *lt_font[LT_FONTSIZE];
-extern patch_t *cred_font[CRED_FONTSIZE];
 extern patch_t *emeraldpics[7];
 extern patch_t *tinyemeraldpics[7];
 extern patch_t *rflagico;
@@ -104,6 +116,9 @@ void HU_Init(void);
 
 void HU_LoadGraphics(void);
 
+// Load a HUDGFX patch or NULL.
+patch_t *HU_CachePatch(const char *format, ...);
+
 // reset heads up when consoleplayer respawns.
 void HU_Start(void);
 

src/k_kart.c

@@ -10951,7 +10951,7 @@ static void K_drawInput(void)
 		V_DrawFill(x+(xoffs), y+BUTTH, BUTTW-1, 2, splitflags|31);\
 	}\
 	V_DrawFill(x+(xoffs), y+offs, BUTTW-1, BUTTH, col);\
-	V_DrawFixedPatch((x+1+(xoffs))<<FRACBITS, (y+offs+1)<<FRACBITS, FRACUNIT, splitflags, tny_font[symb-HU_FONTSTART], NULL)
+	V_DrawFixedPatch((x+1+(xoffs))<<FRACBITS, (y+offs+1)<<FRACBITS, FRACUNIT, splitflags, fontv[TINY_FONT].font[symb-HU_FONTSTART], NULL)
 
 	drawbutt(-2*BUTTW, BT_ACCELERATE, 'A');
 	drawbutt(  -BUTTW, BT_BRAKE,      'B');

src/sdl/Srb2SDL-vc10.vcxproj

@@ -231,6 +231,7 @@
     <ClInclude Include="..\hardware\hw_md3load.h" />
     <ClInclude Include="..\hardware\hw_model.h" />
     <ClInclude Include="..\hardware\u_list.h" />
+    <ClInclude Include="..\font.h" />
     <ClInclude Include="..\hu_stuff.h" />
     <ClInclude Include="..\info.h" />
     <ClInclude Include="..\i_addrinfo.h" />
@@ -376,6 +377,7 @@
     <ClCompile Include="..\hardware\hw_trick.c" />
     <ClCompile Include="..\hardware\r_opengl\r_opengl.c" />
     <ClCompile Include="..\hardware\u_list.c" />
+    <ClCompile Include="..\font.c" />
     <ClCompile Include="..\hu_stuff.c" />
     <ClCompile Include="..\info.c" />
     <ClCompile Include="..\i_addrinfo.c">

src/sdl/Srb2SDL-vc9.vcproj

@@ -2090,6 +2090,50 @@
 				RelativePath="..\console.h"
 				>
 			</File>
+			<File
+				RelativePath="..\font.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\font.h"
+				>
+			</File>
 			<File
 				RelativePath="..\hu_stuff.c"
 				>

src/sdl12/Srb2SDL-vc10.vcxproj

@@ -655,6 +655,16 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
+    <ClCompile Include="..\font.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\hu_stuff.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -1366,6 +1376,7 @@
     <ClInclude Include="..\am_map.h" />
     <ClInclude Include="..\command.h" />
     <ClInclude Include="..\console.h" />
+    <ClInclude Include="..\font.h" />
     <ClInclude Include="..\hu_stuff.h" />
     <ClInclude Include="..\st_stuff.h" />
     <ClInclude Include="..\y_inter.h" />

src/sdl12/Srb2SDL-vc9.vcproj

@@ -2090,6 +2090,50 @@
 				RelativePath="..\console.h"
 				>
 			</File>
+			<File
+				RelativePath="..\font.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\font.h"
+				>
+			</File>
 			<File
 				RelativePath="..\hu_stuff.c"
 				>

src/st_stuff.h

@@ -65,7 +65,6 @@ extern INT32 st_palette; // 0 is default, any others are special palettes.
 
 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;

src/v_video.h

@@ -173,6 +173,12 @@ void V_DrawCustomFadeScreen(const char *lump, UINT8 strength);
 void V_DrawFadeConsBack(INT32 plines);
 void V_EncoreInvertScreen(void);
 
+/* Convenience macros for leagacy string function macros. */
+#define V__DrawOneScaleString( x,y,scale,option,font,string ) \
+	V_DrawStringScaled(x,y,scale,FRACUNIT,FRACUNIT,option,font,string)
+#define V__DrawDupxString( x,y,scale,option,font,string )\
+	V__DrawOneScaleString ((x)<<FRACBITS,(y)<<FRACBITS,scale,option,font,string)
+
 // draw a single character
 void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed);
 // draw a single character, but for the chat
@@ -180,27 +186,44 @@ void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed, UI
 
 UINT8 *V_GetStringColormap(INT32 colorflags);
 
-void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string);
+#define V_DrawLevelTitle( x,y,option,string ) \
+	V__DrawDupxString (x,y,FRACUNIT,option,LT_FONT,string)
 
 // wordwrap a string using the hu_font
 char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string);
 
+// draw a string using a font
+void V_DrawStringScaled(
+		fixed_t     x,
+		fixed_t     y,
+		fixed_t           scale,
+		fixed_t     space_scale,
+		fixed_t  linefeed_scale,
+		INT32       flags,
+		int         font,
+		const char *text);
+
 // draw a string using the hu_font
-void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string);
+#define V_DrawString( x,y,option,string ) \
-void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string);	// SRB2kart
+	V__DrawDupxString (x,y,FRACUNIT,option,HU_FONT,string)
+#define V_DrawKartString( x,y,option,string ) \
+	V__DrawDupxString (x,y,FRACUNIT,option,KART_FONT,string)
 void V_DrawCenteredString(INT32 x, INT32 y, INT32 option, const char *string);
 void V_DrawRightAlignedString(INT32 x, INT32 y, INT32 option, const char *string);
 
 // draw a string using the hu_font, 0.5x scale
-void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string);
+#define V_DrawSmallString( x,y,option,string ) \
+	V__DrawDupxString (x,y,FRACUNIT>>1,option,HU_FONT,string)
 void V_DrawRightAlignedSmallString(INT32 x, INT32 y, INT32 option, const char *string);
 
 // draw a string using the tny_font
-void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string);
+#define V_DrawThinString( x,y,option,string ) \
+	V__DrawDupxString (x,y,FRACUNIT,option,TINY_FONT,string)
 void V_DrawCenteredThinString(INT32 x, INT32 y, INT32 option, const char *string);
 void V_DrawRightAlignedThinString(INT32 x, INT32 y, INT32 option, const char *string);
 
-void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);
+#define V_DrawStringAtFixed( x,y,option,string ) \
+	V__DrawOneScaleString (x,y,FRACUNIT,option,HU_FONT,string)
 
 // Draw tall nums, used for menu, HUD, intermission
 void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num);
@@ -214,7 +237,8 @@ void V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *colorm
 INT32 V_LevelNameWidth(const char *string);
 INT32 V_LevelNameHeight(const char *string);
 
-void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string);
+#define V_DrawCreditString( x,y,option,string ) \
+	V__DrawOneScaleString (x,y,FRACUNIT,option,CRED_FONT,string)
 INT32 V_CreditStringWidth(const char *string);
 
 // Find string width from hu_font chars

src/win32/Srb2win-vc10.vcxproj

@@ -223,6 +223,20 @@
     <ClCompile Include="..\f_wipe.c" />
     <ClCompile Include="..\g_game.c" />
     <ClCompile Include="..\g_input.c" />
+    <ClCompile Include="..\hardware\hw3sound.c" />
+    <ClCompile Include="..\hardware\hw_bsp.c" />
+    <ClCompile Include="..\hardware\hw_cache.c" />
+    <ClCompile Include="..\hardware\hw_clip.c" />
+    <ClCompile Include="..\hardware\hw_draw.c" />
+    <ClCompile Include="..\hardware\hw_light.c" />
+    <ClCompile Include="..\hardware\hw_main.c" />
+    <ClCompile Include="..\hardware\hw_md2.c" />
+    <ClCompile Include="..\hardware\hw_md2load.c" />
+    <ClCompile Include="..\hardware\hw_md3load.c" />
+    <ClCompile Include="..\hardware\hw_model.c" />
+    <ClCompile Include="..\hardware\hw_trick.c" />
+    <ClCompile Include="..\hardware\u_list.c" />
+    <ClCompile Include="..\font.c" />
     <ClCompile Include="..\hu_stuff.c" />
     <ClCompile Include="..\info.c" />
     <ClCompile Include="..\i_addrinfo.c">
@@ -376,6 +390,21 @@
     <ClInclude Include="..\hardware\hw3dsdrv.h" />
     <ClInclude Include="..\hardware\hw3sound.h" />
     <ClInclude Include="..\hardware\hws_data.h" />
+    <ClInclude Include="..\hardware\hw_clip.h" />
+    <ClInclude Include="..\hardware\hw_data.h" />
+    <ClInclude Include="..\hardware\hw_defs.h" />
+    <ClInclude Include="..\hardware\hw_dll.h" />
+    <ClInclude Include="..\hardware\hw_drv.h" />
+    <ClInclude Include="..\hardware\hw_glide.h" />
+    <ClInclude Include="..\hardware\hw_glob.h" />
+    <ClInclude Include="..\hardware\hw_light.h" />
+    <ClInclude Include="..\hardware\hw_main.h" />
+    <ClInclude Include="..\hardware\hw_md2.h" />
+    <ClInclude Include="..\hardware\hw_md2load.h" />
+    <ClInclude Include="..\hardware\hw_md3load.h" />
+    <ClInclude Include="..\hardware\hw_model.h" />
+    <ClInclude Include="..\hardware\u_list.h" />
+    <ClInclude Include="..\font.h" />
     <ClInclude Include="..\hu_stuff.h" />
     <ClInclude Include="..\info.h" />
     <ClInclude Include="..\i_addrinfo.h" />

src/win32/Srb2win-vc9.vcproj

@@ -1831,6 +1831,50 @@
 				RelativePath="..\console.h"
 				>
 			</File>
+			<File
+				RelativePath="..\font.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\font.h"
+				>
+			</File>
 			<File
 				RelativePath="..\hu_stuff.c"
 				>