From 5f4889d99e2e075397179c30b2f6fb4ec9606977 Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Tue, 7 Aug 2012 08:11:56 +0000
Subject: [PATCH] - Backported SPACEWIDTH for fontdefs from ECWolf.

SVN r3811 (trunk)
---
 src/v_font.cpp | 19 ++++++++++++++++---
 src/v_font.h   |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/v_font.cpp b/src/v_font.cpp
index 3ef631c5c..176b5097d 100644
--- a/src/v_font.cpp
+++ b/src/v_font.cpp
@@ -339,7 +339,7 @@ FArchive &SerializeFFontPtr (FArchive &arc, FFont* &font)
 //
 //==========================================================================
 
-FFont::FFont (const char *name, const char *nametemplate, int first, int count, int start, int fdlump)
+FFont::FFont (const char *name, const char *nametemplate, int first, int count, int start, int fdlump, int spacewidth)
 {
 	int i;
 	FTextureID lump;
@@ -422,7 +422,11 @@ FFont::FFont (const char *name, const char *nametemplate, int first, int count,
 		}
 	}
 
-	if ('N'-first >= 0 && 'N'-first < count && Chars['N' - first].Pic != NULL)
+	if (spacewidth != -1)
+	{
+		SpaceWidth = spacewidth;
+	}
+	else if ('N'-first >= 0 && 'N'-first < count && Chars['N' - first].Pic != NULL)
 	{
 		SpaceWidth = (Chars['N' - first].XMove + 1) / 2;
 	}
@@ -2056,6 +2060,7 @@ void V_InitCustomFonts()
 	int start;
 	int first;
 	int count;
+	int spacewidth;
 	char cursor = '_';
 
 	while ((llump = Wads.FindLump ("FONTDEFS", &lastlump)) != -1)
@@ -2070,6 +2075,7 @@ void V_InitCustomFonts()
 			start = 33;
 			first = 33;
 			count = 223;
+			spacewidth = -1;
 
 			sc.MustGetStringName ("{");
 			while (!sc.CheckString ("}"))
@@ -2108,6 +2114,13 @@ void V_InitCustomFonts()
 					sc.MustGetString();
 					cursor = sc.String[0];
 				}
+				else if (sc.Compare ("SPACEWIDTH"))
+				{
+					if (format == 2) goto wrong;
+					sc.MustGetNumber();
+					spacewidth = sc.Number;
+					format = 1;
+				}
 				else if (sc.Compare ("NOTRANSLATION"))
 				{
 					if (format == 1) goto wrong;
@@ -2151,7 +2164,7 @@ void V_InitCustomFonts()
 			}
 			if (format == 1)
 			{
-				FFont *fnt = new FFont (namebuffer, templatebuf, first, count, start, llump);
+				FFont *fnt = new FFont (namebuffer, templatebuf, first, count, start, llump, spacewidth);
 				fnt->SetCursor(cursor);
 			}
 			else if (format == 2)
diff --git a/src/v_font.h b/src/v_font.h
index 0b510612d..13dca6e2c 100644
--- a/src/v_font.h
+++ b/src/v_font.h
@@ -76,7 +76,7 @@ extern int NumTextColors;
 class FFont
 {
 public:
-	FFont (const char *fontname, const char *nametemplate, int first, int count, int base, int fdlump);
+	FFont (const char *fontname, const char *nametemplate, int first, int count, int base, int fdlump, int spacewidth=-1);
 	virtual ~FFont ();
 
 	virtual FTexture *GetChar (int code, int *const width) const;