* (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)
This commit is contained in:
Tim Angus 2007-11-23 00:33:13 +00:00
parent f2f8e73d58
commit 3f3e1a51a1
3 changed files with 7 additions and 1 deletions

View file

@ -284,6 +284,8 @@ cvar_t *Cvar_Get( const char *var_name, const char *var_value, int flags ) {
cvar_vars = var; cvar_vars = var;
var->flags = flags; var->flags = flags;
// note what types of cvars have been modified (userinfo, archive, serverinfo, systeminfo)
cvar_modifiedFlags |= var->flags;
hash = generateHashValue(var_name); hash = generateHashValue(var_name);
var->hashNext = hashTable[hash]; var->hashNext = hashTable[hash];

View file

@ -280,6 +280,11 @@ void SV_Startup( void ) {
} }
svs.initialized = qtrue; 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" ); Cvar_Set( "sv_running", "1" );
} }

View file

@ -578,7 +578,6 @@ static void Text_Paint_Limit(float *maxX, float x, float y, float scale, vec4_t
void UI_ShowPostGame(qboolean newHigh) { void UI_ShowPostGame(qboolean newHigh) {
trap_Cvar_Set ("cg_cameraOrbit", "0"); trap_Cvar_Set ("cg_cameraOrbit", "0");
trap_Cvar_Set("cg_thirdPerson", "0"); trap_Cvar_Set("cg_thirdPerson", "0");
trap_Cvar_Set( "sv_killserver", "1" );
uiInfo.soundHighScore = newHigh; uiInfo.soundHighScore = newHigh;
_UI_SetActiveMenu(UIMENU_POSTGAME); _UI_SetActiveMenu(UIMENU_POSTGAME);
} }