From: Mario <mario.mario@y7mail.com>
Date: Sun, 27 Jan 2013 12:04:38 +0000 (+1100)
Subject: Remove unused cvar
X-Git-Tag: xonotic-v0.8.0~241^2^2~550
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5f9b25fac221d0fdbd2053786747c260a33857c6;p=xonotic%2Fxonotic-data.pk3dir.git

Remove unused cvar
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index 1d6645755..1219cd0ba 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -486,7 +486,6 @@ set g_td_start_wave 1
 set g_td_generator_health 700
 set g_td_generator_damaged_points 20 "player loses this many points if the generator was damaged during the wave"
 set g_td_current_monsters 10 "maximum monsters that can be spawned simultaneously"
-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_buildphase_time 20
diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index 2b00cbc08..f442067d6 100644
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -358,7 +358,6 @@ string RandomMonster()
 	RandomSelection_Init();
 	
 	if(n_demons) RandomSelection_Add(world, 0, "demon", 1, 1);
-	if(n_wizards && flyspawns_count > 0) RandomSelection_Add(world, 0, "scrag", 1, 1);
 	if(n_shalraths) RandomSelection_Add(world, 0, "vore", 1, 1);
 	if(n_soldiers) RandomSelection_Add(world, 0, "soldier", 1, 1);
 	if(n_hknights) RandomSelection_Add(world, 0, "hellknight", 1, 1);
@@ -370,6 +369,7 @@ string RandomMonster()
 	if(n_knights) RandomSelection_Add(world, 0, "knight", 1, 1);
 	if(n_shamblers) RandomSelection_Add(world, 0, "shambler", 0.2, 0.2);
 	if(n_tarbabies) RandomSelection_Add(world, 0, "spawn", 0.2, 0.2);
+	if(n_wizards && flyspawns_count > 0) RandomSelection_Add(world, 0, "scrag", 1, 1);
 	if(n_fish && waterspawns_count > 0) RandomSelection_Add(world, 0, "fish", 0.2, 0.2);
 	
 	return RandomSelection_chosen_string;
@@ -394,7 +394,7 @@ void combat_phase()
 	monstrngth = Monster_GetStrength(whichmon);
 	montype = Monster_GetType(whichmon);
 	
-	if(current_monsters < autocvar_g_td_current_monsters && whichmon != "")
+	if(current_monsters <= autocvar_g_td_current_monsters && whichmon != "")
 	{
 		TD_SpawnMonster(whichmon, monstrngth, montype);
 		self.nextthink = time + 3;
@@ -426,7 +426,7 @@ void queue_monsters(float maxmonsters)
 	n_tarbabies = DistributeEvenly_Get(0.7);
 	n_shamblers = DistributeEvenly_Get(0.3);
 	if(flyspawns_count > 0)
-		n_wizards   = DistributeEvenly_Get(1);
+		n_wizards = DistributeEvenly_Get(1);
 	if(waterspawns_count > 0)
 		n_fish = DistributeEvenly_Get(1);
 }
@@ -609,7 +609,7 @@ void td_ScoreRules()
 {
 	ScoreInfo_SetLabel_PlayerScore(SP_TD_SCORE,		"score",	 SFL_SORT_PRIO_PRIMARY);
 	ScoreInfo_SetLabel_PlayerScore(SP_TD_KILLS,		"kills",	 SFL_LOWER_IS_BETTER);
-	ScoreInfo_SetLabel_PlayerScore(SP_TD_TURKILLS,  "frags",  	SFL_LOWER_IS_BETTER);
+	ScoreInfo_SetLabel_PlayerScore(SP_TD_TURKILLS,  "frags",  	 SFL_LOWER_IS_BETTER);
 	ScoreInfo_SetLabel_PlayerScore(SP_TD_DEATHS,    "deaths",    SFL_LOWER_IS_BETTER);
 	ScoreInfo_SetLabel_PlayerScore(SP_TD_SUICIDES,  "suicides",  SFL_LOWER_IS_BETTER | SFL_ALLOW_HIDE);
 	ScoreRules_basics_end();