From: Mario <mario.mario@y7mail.com>
Date: Thu, 24 Jan 2013 14:31:25 +0000 (+1100)
Subject: Properly fix TD timelimit
X-Git-Tag: xonotic-v0.8.0~241^2^2~572
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f5a5b1fa7ed8ec9d1788cbcf19d35b310e8e470;p=xonotic%2Fxonotic-data.pk3dir.git

Properly fix TD timelimit
---

diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 253c7750b..c036b6d8f 100644
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -39,7 +39,7 @@ REGISTER_GAMETYPE(_("Deathmatch"),dm,g_dm,DEATHMATCH,"timelimit=20 pointlimit=30
 REGISTER_GAMETYPE(_("Last Man Standing"),lms,g_lms,LMS,"timelimit=20 lives=9 leadlimit=0")
 #define g_lms IS_GAMETYPE(LMS)
 
-REGISTER_GAMETYPE(_("Tower Defense"),td,g_td,TD,"timelimit=20 pointlimit=10 leadlimit=0")
+REGISTER_GAMETYPE(_("Tower Defense"),td,g_td,TD,"timelimit=0 pointlimit=10 leadlimit=0")
 #define g_td IS_GAMETYPE(TD)
 
 REGISTER_GAMETYPE(_("Arena"),arena,g_arena,ARENA,"timelimit=20 pointlimit=10 leadlimit=0")
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index f10836927..bacdce417 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2229,8 +2229,8 @@ void CheckRules_World()
 		return;
 	}
 
-	if(g_onslaught || g_td)
-		timelimit = 0; // ONS & TD have their own overtime rule
+	if(g_onslaught)
+		timelimit = 0; // ONS has its own overtime rule
 
 	float wantovertime;
 	wantovertime = 0;