From: Mario <mario.mario@y7mail.com>
Date: Thu, 24 Jan 2013 14:29:04 +0000 (+1100)
Subject: Fix spider not attacking & TD matches running out of time
X-Git-Tag: xonotic-v0.8.0~241^2^2~573
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a64f8f4ebbc87d5ad8600f92b508052685b954f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix spider not attacking & TD matches running out of time
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index bacdce417..f10836927 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -2229,8 +2229,8 @@ void CheckRules_World()
 		return;
 	}
 
-	if(g_onslaught)
-		timelimit = 0; // ONS has its own overtime rule
+	if(g_onslaught || g_td)
+		timelimit = 0; // ONS & TD have their own overtime rule
 
 	float wantovertime;
 	wantovertime = 0;
diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc
index 744e05eb4..1e54b02e2 100644
--- a/qcsrc/server/monsters/monster/spider.qc
+++ b/qcsrc/server/monsters/monster/spider.qc
@@ -186,6 +186,7 @@ void spider_spawn()
 	self.nextthink	  		= time + random() * 0.5 + 0.1;
 	self.pain_finished  	= self.nextthink;
 	self.frame		  		= spider_anim_idle;
+	self.checkattack		= GenericCheckAttack;
 	self.attack_melee		= spider_attack_standing;
 	self.attack_ranged		= spider_attack_ranged;
 	self.think		  		= spider_think;