r1148 - in branches/unified-sdl: . code/qcommon code/sys

[DONOTREPLY at icculus.org]

Author: tma
Date: 2007-09-02 11:05:37 -0400 (Sun, 02 Sep 2007)
New Revision: 1148

Modified:
   branches/unified-sdl/README
   branches/unified-sdl/code/qcommon/common.c
   branches/unified-sdl/code/qcommon/qcommon.h
   branches/unified-sdl/code/sys/sys_main.c
Log:
* Move com_ansiColor initialisation to code/qcommon/


Modified: branches/unified-sdl/README
===================================================================
--- branches/unified-sdl/README	2007-09-02 14:47:28 UTC (rev 1147)
+++ branches/unified-sdl/README	2007-09-02 15:05:37 UTC (rev 1148)
@@ -128,7 +128,7 @@
   s_sdlDevSamps                     - SDL DMA buffer size override
   s_sdlMixSamps                     - SDL mix buffer size override
 
-  com_ansicolor                     - enable use of ANSI escape codes in the tty
+  com_ansiColor                     - enable use of ANSI escape codes in the tty
   com_altivec                       - enable use of altivec on PowerPC systems
   s_backend                         - read only, indicates the current sound
                                       backend

Modified: branches/unified-sdl/code/qcommon/common.c
===================================================================
--- branches/unified-sdl/code/qcommon/common.c	2007-09-02 14:47:28 UTC (rev 1147)
+++ branches/unified-sdl/code/qcommon/common.c	2007-09-02 15:05:37 UTC (rev 1148)
@@ -80,6 +80,7 @@
 cvar_t  *cl_packetdelay;
 cvar_t  *sv_packetdelay;
 cvar_t	*com_cameraMode;
+cvar_t	*com_ansiColor;
 
 // com_speeds times
 int		time_game;
@@ -2460,6 +2461,7 @@
 	com_sv_running = Cvar_Get ("sv_running", "0", CVAR_ROM);
 	com_cl_running = Cvar_Get ("cl_running", "0", CVAR_ROM);
 	com_buildScript = Cvar_Get( "com_buildScript", "0", 0 );
+	com_ansiColor = Cvar_Get( "com_ansiColor", "0", CVAR_ARCHIVE );
 
 	com_introPlayed = Cvar_Get( "com_introplayed", "0", CVAR_ARCHIVE);
 

Modified: branches/unified-sdl/code/qcommon/qcommon.h
===================================================================
--- branches/unified-sdl/code/qcommon/qcommon.h	2007-09-02 14:47:28 UTC (rev 1147)
+++ branches/unified-sdl/code/qcommon/qcommon.h	2007-09-02 15:05:37 UTC (rev 1148)
@@ -752,6 +752,7 @@
 extern	cvar_t	*com_buildScript;		// for building release pak files
 extern	cvar_t	*com_journal;
 extern	cvar_t	*com_cameraMode;
+extern	cvar_t	*com_ansiColor;
 extern	cvar_t	*com_altivec;
 
 // both client and server must agree to pause

Modified: branches/unified-sdl/code/sys/sys_main.c
===================================================================
--- branches/unified-sdl/code/sys/sys_main.c	2007-09-02 14:47:28 UTC (rev 1147)
+++ branches/unified-sdl/code/sys/sys_main.c	2007-09-02 15:05:37 UTC (rev 1148)
@@ -312,7 +312,7 @@
 	TTY_Hide();
 #endif
 
-	if( Cvar_VariableIntegerValue( "com_ansicolor" ) )
+	if( com_ansiColor && com_ansiColor->integer )
 	{
 		char ansiColorString[ MAXPRINTMSG ];
 		Sys_ANSIColorify( msg, ansiColorString, MAXPRINTMSG );
@@ -754,8 +754,6 @@
 	signal( SIGSEGV, Sys_SigHandler );
 	signal( SIGTERM, Sys_SigHandler );
 
-	Cvar_Get( "com_ansicolor", "0", CVAR_ARCHIVE );
-
 	while( 1 )
 	{
 #ifndef DEDICATED