[Shared] Fix ocr_a font not working in console anymore after renderer…

… restart.
wally4000 · Nov 11, 2023 · c54bc58 · c54bc58
1 parent 371b8d6
commit c54bc58
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/code/client/cl_console.cpp b/code/client/cl_console.cpp
@@ -608,7 +608,7 @@ void Con_DrawNotify (void)
 	currentColor = 7;
 	re.SetColor( g_color_table[currentColor] );
 
-	static int iFontIndex = re.RegisterFont("ocr_a");
+	int iFontIndex = cls.consoleFont;
 	float fFontScale = 1.0f;
 	int iPixelHeightToAdvance = 0;
 	if (re.Language_IsAsian())
@@ -765,7 +765,7 @@ void Con_DrawSolidConsole( float frac )
 	currentColor = 7;
 	re.SetColor( g_color_table[currentColor] );
 
-	static int iFontIndex = re.RegisterFont("ocr_a");
+	int iFontIndex = cls.consoleFont;
 	float fFontScale = 1.0f;
 	int iPixelHeightToAdvance = con.charHeight;
 	if (re.Language_IsAsian())

diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
@@ -935,6 +935,7 @@ void CL_InitRenderer( void ) {
 
 	// load character sets
 	cls.charSetShader = re.RegisterShaderNoMip("gfx/2d/charsgrid_med");
+	cls.consoleFont = re.RegisterFont( "ocr_a" );
 	cls.whiteShader = re.RegisterShader( "white" );
 	cls.consoleShader = re.RegisterShader( "console" );
 	g_console_field_width = cls.glconfig.vidWidth / SMALLCHAR_WIDTH - 2;

diff --git a/code/client/client.h b/code/client/client.h
@@ -206,6 +206,7 @@ typedef struct {
 	qhandle_t	charSetShader;
 	qhandle_t	whiteShader;
 	qhandle_t	consoleShader;
+	int			consoleFont;
 } clientStatic_t;
 
 #define	CON_TEXTSIZE	0x30000 //was 32768

diff --git a/codemp/client/cl_console.cpp b/codemp/client/cl_console.cpp
@@ -732,7 +732,7 @@ void Con_DrawNotify (void)
 	currentColor = 7;
 	re->SetColor( g_color_table[currentColor] );
 
-	static int iFontIndex = re->RegisterFont("ocr_a");
+	int iFontIndex = cls.consoleFont;
 	float fFontScale = 1.0f;
 	int iPixelHeightToAdvance = 0;
 	if (re->Language_IsAsian())
@@ -928,7 +928,7 @@ void Con_DrawSolidConsole( float frac ) {
 	currentColor = 7;
 	re->SetColor( g_color_table[currentColor] );
 
-	static int iFontIndex = re->RegisterFont("ocr_a");
+	int iFontIndex = cls.consoleFont;
 	float fFontScale = 1.0f;
 	int iPixelHeightToAdvance = con.charHeight;
 	if (re->Language_IsAsian())

diff --git a/codemp/client/cl_main.cpp b/codemp/client/cl_main.cpp
@@ -2290,6 +2290,7 @@ void CL_InitRenderer( void ) {
 
 	// load character sets
 	cls.charSetShader = re->RegisterShaderNoMip("gfx/2d/charsgrid_med");
+	cls.consoleFont = re->RegisterFont( "ocr_a" );
 
 	cls.whiteShader = re->RegisterShader( "white" );
 	cls.consoleShader = re->RegisterShader( "console" );

diff --git a/codemp/client/client.h b/codemp/client/client.h
@@ -326,6 +326,7 @@ typedef struct clientStatic_s {
 	qhandle_t	charSetShader;
 	qhandle_t	whiteShader;
 	qhandle_t	consoleShader;
+	int			consoleFont;
 } clientStatic_t;
 
 #define	CON_TEXTSIZE	0x30000 //was 32768