font: fix build since abc cache in basefont

FWGS · Jun 8, 2022 · 0a28db3 · 0a28db3
1 parent 8e2ce07
commit 0a28db3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 33 deletions.
diff --git a/font/StbFont.cpp b/font/StbFont.cpp
@@ -38,9 +38,8 @@ GNU General Public License for more details.
 #include "Utils.h"
 
 CStbFont::CStbFont() : CBaseFont(),
-	m_ABCCache(0, 0), m_szRealFontFile(), m_pFontData( NULL )
+	m_szRealFontFile(), m_pFontData( NULL )
 {
-	SetDefLessFunc( m_ABCCache );
 }
 
 CStbFont::~CStbFont()

diff --git a/font/StbFont.h b/font/StbFont.h
@@ -20,16 +20,6 @@ GNU General Public License for more details.
 #include "utlrbtree.h"
 #include "stb_truetype.h"
 
-struct abc_t
-{
-	int ch;
-	int a, b, c;
-
-	bool operator< (const abc_t &a) const
-	{
-		return ch < a.ch;
-	}
-};
 
 class CStbFont : public CBaseFont
 {
@@ -48,8 +38,6 @@ class CStbFont : public CBaseFont
 	bool HasChar( int ch ) const override;
 
 private:
-	CUtlRBTree<abc_t, int> m_ABCCache;
-
 	char m_szRealFontFile[4096];
 	bool FindFontDataFile(const char *name, int tall, int weight, int flags, char *dataFile, int dataFileChars);
 
@@ -58,7 +46,6 @@ class CStbFont : public CBaseFont
 
 	float scale;
 
-
 	friend class CFontManager;
 };
 

diff --git a/font/WinAPIFont.cpp b/font/WinAPIFont.cpp
@@ -21,9 +21,8 @@ GNU General Public License for more details.
 #include "WinAPIFont.h"
 
 
-CWinAPIFont::CWinAPIFont( ) : CBaseFont( ), m_ABCCache( 0, 0 )
+CWinAPIFont::CWinAPIFont( ) : CBaseFont( )
 {
-	SetDefLessFunc( m_ABCCache );
 }
 
 CWinAPIFont::~CWinAPIFont( )

diff --git a/font/WinAPIFont.h b/font/WinAPIFont.h
@@ -27,17 +27,6 @@ GNU General Public License for more details.
 #include "utlmemory.h"
 #include "utlrbtree.h"
 
-struct abc_t
-{
-	int ch;
-	int a, b, c;
-
-	bool operator<(const abc_t &a) const
-	{
-		return ch < a.ch;
-	}
-};
-
 class CWinAPIFont : public CBaseFont
 {
 public:
@@ -57,20 +46,15 @@ class CWinAPIFont : public CBaseFont
 	bool m_bFound;
 
 private:
-	CUtlRBTree<abc_t, int> m_ABCCache;
-
 	HFONT m_hFont;
 	HDC m_hDC;
 	HBITMAP m_hDIB;
 
-
 	int m_rgiBitmapSize[2];
 
 	// pointer to buffer for use when generated bitmap versions of a texture
-
 	unsigned char	*m_pBuf;
 
-
 	friend class CFontManager;
 	friend int CALLBACK FontEnumProc( const LOGFONT *, const TEXTMETRIC *, DWORD, LPARAM lpParam );
 };