From 9192bceadf356aa5bb77069adee90f087250459a Mon Sep 17 00:00:00 2001 From: "M. Kristall" Date: Fri, 29 Apr 2011 01:27:31 +0000 Subject: * g_disabled* cvars should not persist --- src/game/g_main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/game/g_main.c b/src/game/g_main.c index af6cc3b5..44ed6182 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -148,6 +148,9 @@ vmCvar_t g_tag; static char cv_gravity[ MAX_CVAR_VALUE_STRING ]; static char cv_humanMaxStage[ MAX_CVAR_VALUE_STRING ]; static char cv_alienMaxStage[ MAX_CVAR_VALUE_STRING ]; +static char cv_disabledBuildables[ MAX_CVAR_VALUE_STRING ]; +static char cv_disabledClasses[ MAX_CVAR_VALUE_STRING ]; +static char cv_disabledEquipment[ MAX_CVAR_VALUE_STRING ]; static cvarTable_t gameCvarTable[ ] = { @@ -232,9 +235,9 @@ static cvarTable_t gameCvarTable[ ] = { &g_unlagged, "g_unlagged", "1", CVAR_SERVERINFO | CVAR_ARCHIVE, 0, qtrue }, - { &g_disabledEquipment, "g_disabledEquipment", "", CVAR_ROM | CVAR_SYSTEMINFO, 0, qfalse }, - { &g_disabledClasses, "g_disabledClasses", "", CVAR_ROM | CVAR_SYSTEMINFO, 0, qfalse }, - { &g_disabledBuildables, "g_disabledBuildables", "", CVAR_ROM | CVAR_SYSTEMINFO, 0, qfalse }, + { &g_disabledEquipment, "g_disabledEquipment", "", CVAR_ROM | CVAR_SYSTEMINFO, 0, qfalse, cv_disabledEquipment }, + { &g_disabledClasses, "g_disabledClasses", "", CVAR_ROM | CVAR_SYSTEMINFO, 0, qfalse, cv_disabledClasses }, + { &g_disabledBuildables, "g_disabledBuildables", "", CVAR_ROM | CVAR_SYSTEMINFO, 0, qfalse, cv_disabledBuildables }, { &g_sayAreaRange, "g_sayAreaRange", "1000", CVAR_ARCHIVE, 0, qtrue }, -- cgit