From b1098cc61f05b20cc3a5f21a55ef182e05e2c628 Mon Sep 17 00:00:00 2001 From: q3rally Date: Sat, 11 Sep 2021 23:10:09 +0000 Subject: [PATCH] reverted the last changes (thx zturtleman) --- engine/code/cgame/cg_main.c | 1 - engine/code/client/cl_main.c | 1 - engine/code/q3_ui/ui_qmenu.c | 1 - q3rallycode.ppr | 8 ++++---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/engine/code/cgame/cg_main.c b/engine/code/cgame/cg_main.c index 73e5112f..2674e106 100644 --- a/engine/code/cgame/cg_main.c +++ b/engine/code/cgame/cg_main.c @@ -2173,7 +2173,6 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) { // load a few needed things before we do any screen updates cgs.media.charsetShader = trap_R_RegisterShader( "gfx/2d/bigchars" ); - cgs.media.charsetShader = trap_R_RegisterShader( "gfx/2d/bigchars_plates" ); cgs.media.whiteShader = trap_R_RegisterShader( "white" ); cgs.media.charsetProp = trap_R_RegisterShaderNoMip( "menu/art/font1_prop.tga" ); cgs.media.charsetPropGlow = trap_R_RegisterShaderNoMip( "menu/art/font1_prop_glo.tga" ); diff --git a/engine/code/client/cl_main.c b/engine/code/client/cl_main.c index 779f7337..6c257952 100644 --- a/engine/code/client/cl_main.c +++ b/engine/code/client/cl_main.c @@ -3128,7 +3128,6 @@ void CL_InitRenderer( void ) { // load character sets cls.charSetShader = re.RegisterShader( "gfx/2d/bigchars" ); - cls.charSetShader = re.RegisterShader( "gfx/2d/bigchars_plates" ); cls.whiteShader = re.RegisterShader( "white" ); cls.consoleShader = re.RegisterShader( "console" ); g_console_field_width = cls.glconfig.vidWidth / SMALLCHAR_WIDTH - 2; diff --git a/engine/code/q3_ui/ui_qmenu.c b/engine/code/q3_ui/ui_qmenu.c index 42dd9141..9b23514d 100644 --- a/engine/code/q3_ui/ui_qmenu.c +++ b/engine/code/q3_ui/ui_qmenu.c @@ -2233,7 +2233,6 @@ Menu_Cache void Menu_Cache( void ) { uis.charset = trap_R_RegisterShaderNoMip( "gfx/2d/bigchars" ); - uis.charset = trap_R_RegisterShaderNoMip( "gfx/2d/bigchars_plates" ); uis.charsetProp = trap_R_RegisterShaderNoMip( "menu/art/font1_prop.tga" ); uis.charsetPropGlow = trap_R_RegisterShaderNoMip( "menu/art/font1_prop_glo.tga" ); uis.charsetPropB = trap_R_RegisterShaderNoMip( "menu/art/font2_prop.tga" ); diff --git a/q3rallycode.ppr b/q3rallycode.ppr index d3e0be3f..082acee2 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -894,7 +894,7 @@ q3rallycode 6=engine\code\q3_ui\ui_qmenu.c [Selected Project Files] Main= -Selected=engine\code\qcommon\q_shared.h +Selected=engine\code\cgame\cg_main.c [engine\code\qcommon\q_shared.h] TopLine=59 Caret=36,70 @@ -909,10 +909,10 @@ TopLine=127 Caret=38,151 [engine\code\cgame\cg_main.c] TopLine=2159 -Caret=85,2176 +Caret=72,2175 [engine\code\client\cl_main.c] TopLine=3114 -Caret=67,3131 +Caret=61,3130 [engine\code\q3_ui\ui_qmenu.c] TopLine=2219 -Caret=72,2236 +Caret=66,2235