diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2011-08-07 23:19:33 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:18:12 +0000 |
| commit | cb1e78beeeae8ff8f78310cff3bc30e9b9dce8b8 (patch) | |
| tree | 3d1b97cf982a0d59c85b8b0c1b2314474126f764 /src/game | |
| parent | f8bd44281b3369f667923305768ac7424a960eed (diff) | |
* (bug 4998) Alternate fix for r2211 (/dev/humancontroller)
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/g_main.c | 9 | ||||
| -rw-r--r-- | src/game/g_spawn.c | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index 05035c84..dc9cdd9d 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -148,9 +148,6 @@ 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[ ] = { @@ -235,9 +232,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, 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_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_sayAreaRange, "g_sayAreaRange", "1000", CVAR_ARCHIVE, 0, qtrue }, diff --git a/src/game/g_spawn.c b/src/game/g_spawn.c index 0bdb366a..1ebc04d0 100644 --- a/src/game/g_spawn.c +++ b/src/game/g_spawn.c @@ -612,14 +612,14 @@ void SP_worldspawn( void ) if( G_SpawnString( "alienMaxStage", "", &s ) ) trap_Cvar_Set( "g_alienMaxStage", s ); - if( G_SpawnString( "disabledEquipment", "", &s ) ) - trap_Cvar_Set( "g_disabledEquipment", s ); + G_SpawnString( "disabledEquipment", "", &s ); + trap_Cvar_Set( "g_disabledEquipment", s ); - if( G_SpawnString( "disabledClasses", "", &s ) ) - trap_Cvar_Set( "g_disabledClasses", s ); + G_SpawnString( "disabledClasses", "", &s ); + trap_Cvar_Set( "g_disabledClasses", s ); - if( G_SpawnString( "disabledBuildables", "", &s ) ) - trap_Cvar_Set( "g_disabledBuildables", s ); + G_SpawnString( "disabledBuildables", "", &s ); + trap_Cvar_Set( "g_disabledBuildables", s ); g_entities[ ENTITYNUM_WORLD ].s.number = ENTITYNUM_WORLD; g_entities[ ENTITYNUM_WORLD ].classname = "worldspawn"; |