[nexuiz-commits] r8343 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-01 04:47:10 -0500 (Tue, 01 Dec 2009)
New Revision: 8343

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_player.qc
Log:
remove old cvars that were for mapcfg


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-12-01 02:26:51 UTC (rev 8342)
+++ trunk/data/defaultNexuiz.cfg	2009-12-01 09:47:10 UTC (rev 8343)
@@ -542,8 +542,6 @@
 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"

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-12-01 02:26:51 UTC (rev 8342)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-12-01 09:47:10 UTC (rev 8343)
@@ -671,18 +671,11 @@
 		// 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");
-		}
+		sdelay = cvar(strcat("g_", GetGametype(), "_respawn_delay"));
 		if(!sdelay)
-			sdelay = cvar(strcat("g_", GetGametype(), "_respawn_delay"));
-		if(!sdelay)
 			sdelay = cvar("g_respawn_delay");
+		waves = cvar(strcat("g_", GetGametype(), "_respawn_waves"));
 		if(!waves)
-			waves = cvar(strcat("g_", GetGametype(), "_respawn_waves"));
-		if(!waves)
 			waves = cvar("g_respawn_waves");
 		if(waves)
 			self.death_time = ceil((time + sdelay) / waves) * waves;