r1216 - in trunk/code: qcommon server ui

[DONOTREPLY at icculus.org]

Author: tma
Date: 2007-11-22 19:33:13 -0500 (Thu, 22 Nov 2007)
New Revision: 1216

Modified:
   trunk/code/qcommon/cvar.c
   trunk/code/server/sv_init.c
   trunk/code/ui/ui_main.c
Log:
* (bug 3420) Don't respect sv_killserver unless a server is actually running
* (bug 3431) USERINFO cvars created in cg_main not getting sent (arQon)


Modified: trunk/code/qcommon/cvar.c
===================================================================
--- trunk/code/qcommon/cvar.c	2007-11-19 19:59:37 UTC (rev 1215)
+++ trunk/code/qcommon/cvar.c	2007-11-23 00:33:13 UTC (rev 1216)
@@ -284,6 +284,8 @@
 	cvar_vars = var;
 
 	var->flags = flags;
+	// note what types of cvars have been modified (userinfo, archive, serverinfo, systeminfo)
+	cvar_modifiedFlags |= var->flags;
 
 	hash = generateHashValue(var_name);
 	var->hashNext = hashTable[hash];

Modified: trunk/code/server/sv_init.c
===================================================================
--- trunk/code/server/sv_init.c	2007-11-19 19:59:37 UTC (rev 1215)
+++ trunk/code/server/sv_init.c	2007-11-23 00:33:13 UTC (rev 1216)
@@ -280,6 +280,11 @@
 	}
 	svs.initialized = qtrue;
 
+	// Don't respect sv_killserver unless a server is actually running
+	if ( sv_killserver->integer ) {
+		Cvar_Set( "sv_killserver", "0" );
+	}
+
 	Cvar_Set( "sv_running", "1" );
 }
 

Modified: trunk/code/ui/ui_main.c
===================================================================
--- trunk/code/ui/ui_main.c	2007-11-19 19:59:37 UTC (rev 1215)
+++ trunk/code/ui/ui_main.c	2007-11-23 00:33:13 UTC (rev 1216)
@@ -578,7 +578,6 @@
 void UI_ShowPostGame(qboolean newHigh) {
 	trap_Cvar_Set ("cg_cameraOrbit", "0");
 	trap_Cvar_Set("cg_thirdPerson", "0");
-	trap_Cvar_Set( "sv_killserver", "1" );
 	uiInfo.soundHighScore = newHigh;
   _UI_SetActiveMenu(UIMENU_POSTGAME);
 }