From: Mario <mario.mario@y7mail.com>
Date: Thu, 18 Apr 2013 08:22:15 +0000 (+1000)
Subject: Add tower defense to the menu
X-Git-Tag: xonotic-v0.8.0~241^2^2~350
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fcc49a26622ac74cbe201e696e2b8d0e75d31386;p=xonotic%2Fxonotic-data.pk3dir.git

Add tower defense to the menu
---

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index b4ca21385..155c3bd4b 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -610,6 +610,7 @@ float updateCompression()
 	GAMETYPE(MAPINFO_TYPE_RACE) \
 	GAMETYPE(MAPINFO_TYPE_CTS) \
 	GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH) \
+	GAMETYPE(MAPINFO_TYPE_TD) \
 	/* nothing */
 
 float GameType_GetID(float cnt)
diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qc b/qcsrc/server/mutators/gamemode_towerdefense.qc
index e47f13aa7..08a516b43 100644
--- a/qcsrc/server/mutators/gamemode_towerdefense.qc
+++ b/qcsrc/server/mutators/gamemode_towerdefense.qc
@@ -666,6 +666,9 @@ void td_Initialize()
 
 MUTATOR_HOOKFUNCTION(td_TurretValidateTarget)
 {
+	if(time < game_starttime || current_phase != PHASE_COMBAT)
+		return FALSE; // battle hasn't started
+
 	if(turret_flags & TFL_TARGETSELECT_MISSILESONLY)
     if(turret_target.flags & FL_PROJECTILE)
 	if(turret_target.owner.flags & FL_MONSTER)