r1269 - trunk/code/qcommon

[DONOTREPLY at icculus.org]

Author: tma
Date: 2008-02-28 16:39:54 -0500 (Thu, 28 Feb 2008)
New Revision: 1269

Modified:
   trunk/code/qcommon/common.c
   trunk/code/qcommon/files.c
   trunk/code/qcommon/qcommon.h
Log:
* Write q3config_server.cfg for the server, to avoid reseting client variables
  after running a dedicated server


Modified: trunk/code/qcommon/common.c
===================================================================
--- trunk/code/qcommon/common.c	2008-02-20 19:41:52 UTC (rev 1268)
+++ trunk/code/qcommon/common.c	2008-02-28 21:39:54 UTC (rev 1269)
@@ -2537,7 +2537,7 @@
 
 	// skip the q3config.cfg if "safe" is on the command line
 	if ( !Com_SafeMode() ) {
-		Cbuf_AddText ("exec q3config.cfg\n");
+		Cbuf_AddText ("exec " Q3CONFIG_CFG "\n");
 	}
 
 	Cbuf_AddText ("exec autoexec.cfg\n");
@@ -2690,7 +2690,7 @@
 	}
 	cvar_modifiedFlags &= ~CVAR_ARCHIVE;
 
-	Com_WriteConfigToFile( "q3config.cfg" );
+	Com_WriteConfigToFile( Q3CONFIG_CFG );
 
 	// not needed for dedicated
 #ifndef DEDICATED

Modified: trunk/code/qcommon/files.c
===================================================================
--- trunk/code/qcommon/files.c	2008-02-20 19:41:52 UTC (rev 1268)
+++ trunk/code/qcommon/files.c	2008-02-28 21:39:54 UTC (rev 1269)
@@ -3317,7 +3317,7 @@
 	if ( Q_stricmp(fs_gamedirvar->string, lastValidGame) ) {
 		// skip the q3config.cfg if "safe" is on the command line
 		if ( !Com_SafeMode() ) {
-			Cbuf_AddText ("exec q3config.cfg\n");
+			Cbuf_AddText ("exec " Q3CONFIG_CFG "\n");
 		}
 	}
 

Modified: trunk/code/qcommon/qcommon.h
===================================================================
--- trunk/code/qcommon/qcommon.h	2008-02-20 19:41:52 UTC (rev 1268)
+++ trunk/code/qcommon/qcommon.h	2008-02-28 21:39:54 UTC (rev 1269)
@@ -536,6 +536,12 @@
 
 #define	MAX_FILE_HANDLES	64
 
+#ifdef DEDICATED
+#	define Q3CONFIG_CFG "q3config_server.cfg"
+#else
+#	define Q3CONFIG_CFG "q3config.cfg"
+#endif
+
 qboolean FS_Initialized( void );
 
 void	FS_InitFilesystem ( void );