From: Mario <mario.mario@y7mail.com>
Date: Sun, 27 Jan 2013 11:14:15 +0000 (+1100)
Subject: Remove some more unused counters
X-Git-Tag: xonotic-v0.8.0~241^2^2~554
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8dd49728a2dd780017fbd84c5e011a1b8cc68ee;p=xonotic%2Fxonotic-data.pk3dir.git

Remove some more unused counters
---

diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index e9e5c878c..0958b9c41 100644
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -69,7 +69,6 @@ void td_generator_damage(entity inflictor, entity attacker, float damage, float
 	FOR_EACH_PLAYER(tail)
 	{
 		Send_CSQC_Centerprint_Generic(tail, CPID_KH_MSG, "The generator is under attack!", 0, 0);
-		gendmg += damage;
 	}
 	
 	self.health -= damage;
@@ -472,7 +471,6 @@ void combat_phase_announce() // TODO: clean up these fail nextthinks...
 	else if(cphase_updates == 6)
 	{
 		Announce("begin");
-		oldrespawncvar = cvar("g_td_respawn_delay");
 		combat_phase_begin();
 	}
 	
@@ -491,8 +489,6 @@ void build_phase()
 	
 	current_phase = PHASE_BUILD;
 	
-	cvar_set("g_td_respawn_delay", ftos(oldrespawncvar));
-	
 	for(head = world;(head = find(head, classname, "td_generator")); )
 	{
 		if(head.health <= 5 && head.max_health > 10)
@@ -539,8 +535,6 @@ void build_phase()
         Send_CSQC_Centerprint_Generic(head, CPID_KH_MSG, strcat(buildmsg, healmsg, countmsg, startmsg), 5, 0);
 		
     }
-	
-	gendmg = 0;
     
     FOR_EACH_MONSTER(head)
     {
@@ -776,8 +770,6 @@ MUTATOR_HOOKFUNCTION(td_MonsterSpawn)
 	
 	self.spawnshieldtime = time + autocvar_g_td_monsters_spawnshield_time;
 	
-	self.lastcheck = time;
-	
 	self.drop_size = self.health * 0.05;
 	
 	if(self.drop_size < 1) self.drop_size = 1;
@@ -910,12 +902,12 @@ MUTATOR_HOOKFUNCTION(td_PlayerCommand)
 		}
 		if(self.classname != STR_PLAYER || self.health <= 0)
 		{ 
-			sprint(self, "Can't spawn turrets while spectating/dead.\n");
+			sprint(self, "Can't spawn turrets while spectating/dead\n");
 			return TRUE;
 		}
 		if(self.turret_cnt >= max_turrets)
 		{
-			sprint(self, sprintf("Can't spawn more than %d turrets.\n", max_turrets));
+			sprint(self, strcat("Can't spawn more than ", ftos(max_turrets), " turrets\n"));
 			return TRUE;
 		}
 		switch(argv(1))
@@ -958,7 +950,7 @@ MUTATOR_HOOKFUNCTION(td_PlayerCommand)
 				return TRUE;
 			}
 		}
-		sprint(self, sprintf("You do not have enough fuel to spawn a %s turret.\n", argv(1)));
+		sprint(self, strcat("You do not have enough fuel to spawn a ", argv(1), " turret\n"));
 		return TRUE;
 	}
 	if(cmd_name == "buffturret")
diff --git a/qcsrc/server/mutators/gamemode_td.qh b/qcsrc/server/mutators/gamemode_td.qh
index 679cbd6ad..30d8e25f7 100644
--- a/qcsrc/server/mutators/gamemode_td.qh
+++ b/qcsrc/server/mutators/gamemode_td.qh
@@ -23,12 +23,10 @@ float SWARM_FLY		= 3;
 float SWARM_SWIM	= 4;
 float build_time;
 float td_dont_end;
-.float lastcheck;
 void(float starting) wave_end;
 .float turret_cnt;
 float td_gencount;
 void() spawnfunc_td_controller;
-float oldrespawncvar;
 float current_phase;
 #define PHASE_BUILD 	1
 #define PHASE_COMBAT 	2
@@ -50,6 +48,5 @@ float current_phase;
 
 // Generator
 float gendestroyed;
-float gendmg;
 #define GENERATOR_MIN '-52 -52 -14'
 #define GENERATOR_MAX '52 52 75'
\ No newline at end of file