From bcf5269539e67be0a6024af35e78bf421aef46b8 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 1 Dec 2009 09:47:10 +0000 Subject: [PATCH] remove old cvars that were for mapcfg git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8343 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 2 -- data/qcsrc/server/cl_player.qc | 11 ++--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 8d3887bc6..6d36c3254 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -542,8 +542,6 @@ set g_rune_respawn_delay 0 set g_rune_respawn_waves 0 set g_tdm_respawn_delay 0 set g_tdm_respawn_waves 0 -// honor g_respawn_mapsettings_delay and g_respawn_mapsettings_waves -set g_respawn_mapsettings 1 // overtime seta timelimit_overtime 2 "duration in minutes of one added overtime, added to the timelimit" diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc index 84e6542ee..42a51727c 100644 --- a/data/qcsrc/server/cl_player.qc +++ b/data/qcsrc/server/cl_player.qc @@ -671,17 +671,10 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht // when to allow respawn sdelay = 0; waves = 0; - if(cvar("g_respawn_mapsettings")) - { - sdelay = cvar("g_respawn_mapsettings_delay"); - waves = cvar("g_respawn_mapsettings_waves"); - } - if(!sdelay) - sdelay = cvar(strcat("g_", GetGametype(), "_respawn_delay")); + sdelay = cvar(strcat("g_", GetGametype(), "_respawn_delay")); if(!sdelay) sdelay = cvar("g_respawn_delay"); - if(!waves) - waves = cvar(strcat("g_", GetGametype(), "_respawn_waves")); + waves = cvar(strcat("g_", GetGametype(), "_respawn_waves")); if(!waves) waves = cvar("g_respawn_waves"); if(waves) -- 2.39.2