From: Mario <mario.mario@y7mail.com>
Date: Sun, 27 Jan 2013 11:17:27 +0000 (+1100)
Subject: Remove broken TD "hardcore" mode
X-Git-Tag: xonotic-v0.8.0~241^2^2~553
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5375a30226199e5644a8b02fbb96ddf27c902370;p=xonotic%2Fxonotic-data.pk3dir.git

Remove broken TD "hardcore" mode
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 8faca21c4..ca632739f 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -489,7 +489,6 @@ set g_td_current_monsters 10 "maximum monsters that can be spawned simultaneousl
 set g_td_miniboss_min_monsters 5 "monster count to start spawning minibosses at"
 set g_td_monster_count 10
 set g_td_monster_count_increment 5
-set g_td_hardcore 0 "if enabled, players can't respawn during combat phase"
 set g_td_buildphase_time 20
 set g_td_generator_dontend 0 "don't change maps when a generator is destroyed (only if there is more than 1 generator)"
 set g_td_pvp 0
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index d0e0ee8ce..ed5e3fbaa 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1276,7 +1276,6 @@ float autocvar_g_sandbox_object_material_velocity_factor;
 float autocvar_g_max_info_autoscreenshot;
 float autocvar_physics_ode;
 float autocvar_g_td_start_wave;
-float autocvar_g_td_hardcore;
 float autocvar_g_td_generator_health;
 float autocvar_g_td_current_monsters;
 float autocvar_g_td_generator_damaged_points;
diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index 0958b9c41..be0655bb9 100644
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -433,9 +433,6 @@ void queue_monsters(float maxmonsters)
 
 void combat_phase_begin()
 {
-	if(autocvar_g_td_hardcore)
-		cvar_set("g_td_respawn_delay", "999");
-		
 	monster_count = totalmonsters;
 	entity head, tail;