diff options
| -rw-r--r-- | code/qcommon/cvar.c | 2 | ||||
| -rw-r--r-- | code/server/sv_init.c | 5 | ||||
| -rw-r--r-- | code/ui/ui_main.c | 1 |
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); } |