From b42b7e09abf0d06d602ab7556f5928da8dbc53eb Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 8 Feb 2003 00:23:19 +0000 Subject: * Added utility function CG_DrawBoundingBox to um.. draw bounding boxes * G_Printf now outputs to the TA UI console as well as the regular one * Light flares now have an extra test to fix the "seeing through thin brushes" bug --- src/cgame/cg_main.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'src/cgame/cg_main.c') diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index ab50ac9b..cc7ec184 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -445,16 +445,9 @@ void CG_RemoveConsoleLine( void ) cg.numConsoleLines--; } -void QDECL CG_Printf( const char *msg, ... ) +//TA: team arena UI based console +void TAUIConsole( const char *text ) { - va_list argptr; - char text[ 1024 ]; - - va_start( argptr, msg ); - vsprintf( text, msg, argptr ); - va_end( argptr ); - - //TA: team arena UI based console if( cg.numConsoleLines == MAX_CONSOLE_LINES ) CG_RemoveConsoleLine( ); @@ -466,6 +459,19 @@ void QDECL CG_Printf( const char *msg, ... ) cg.numConsoleLines++; } +} + +void QDECL CG_Printf( const char *msg, ... ) +{ + va_list argptr; + char text[ 1024 ]; + + va_start( argptr, msg ); + vsprintf( text, msg, argptr ); + va_end( argptr ); + + TAUIConsole( text ); + trap_Print( text ); } @@ -1613,6 +1619,7 @@ void CG_Init( int serverMessageNum, int serverCommandSequence, int clientNum ) // load a few needed things before we do any screen updates cgs.media.whiteShader = trap_R_RegisterShader( "white" ); cgs.media.charsetShader = trap_R_RegisterShader( "gfx/2d/bigchars" ); + cgs.media.outlineShader = trap_R_RegisterShader( "outline" ); //inform UI to repress cursor whilst loading trap_Cvar_Set( "ui_loading", "1" ); -- cgit