aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-11-23 00:33:13 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-11-23 00:33:13 +0000
commit75e6bcf119724b1d3db26707da856e48802e59b4 (patch)
tree88845a6d69ae7fc8709b883c85dfede31d0f095f
parentd0a3453953e9cbcc6dd9b39525088d0c09c45589 (diff)
downloadioquake3-aero-75e6bcf119724b1d3db26707da856e48802e59b4.tar.gz
ioquake3-aero-75e6bcf119724b1d3db26707da856e48802e59b4.zip
* (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) git-svn-id: svn://svn.icculus.org/quake3/trunk@1216 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/qcommon/cvar.c2
-rw-r--r--code/server/sv_init.c5
-rw-r--r--code/ui/ui_main.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index 95a83e1..b484248 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -284,6 +284,8 @@ cvar_t *Cvar_Get( const char *var_name, const char *var_value, int flags ) {
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];
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index c941e7d..9284127 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -280,6 +280,11 @@ void SV_Startup( void ) {
}
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" );
}
diff --git a/code/ui/ui_main.c b/code/ui/ui_main.c
index b6d98aa..f1eae14 100644
--- a/code/ui/ui_main.c
+++ b/code/ui/ui_main.c
@@ -578,7 +578,6 @@ static void Text_Paint_Limit(float *maxX, float x, float y, float scale, vec4_t
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);
}