From: Mario <mario.mario@y7mail.com>
Date: Sun, 27 Jan 2013 11:24:17 +0000 (+1100)
Subject: Use normal monster skill cvar if TD starting skill cvar is 0
X-Git-Tag: xonotic-v0.8.0~241^2^2~552
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f30091ea5bf2ef9a919a337e414cb33ab02d6751;p=xonotic%2Fxonotic-data.pk3dir.git

Use normal monster skill cvar if TD starting skill cvar is 0
---

diff --git a/gamemodes.cfg b/gamemodes.cfg
index ca632739f..1d6645755 100644
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -492,7 +492,7 @@ set g_td_monster_count_increment 5
 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
-set g_td_monsters_skill_start 1
+set g_td_monsters_skill_start 1 "set to 0 to use g_monsters_skill instead"
 set g_td_monsters_skill_increment 0.1
 set g_td_monsters_spawnshield_time 2
 set g_td_max_waves 8
diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index be0655bb9..706fd2a25 100644
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -594,7 +594,7 @@ void wave_end(float starting)
 	}
 	
 	if(starting)
-		monster_skill = autocvar_g_td_monsters_skill_start;
+		monster_skill = ((autocvar_g_td_monsters_skill_start) ? autocvar_g_td_monsters_skill_start : autocvar_g_monsters_skill);
 	else
 		wave_count += 1;