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 bacdce4170d68244ef8871e6bd88dc8a7313e1f1..f108369272c0491c8eb3d4f2bad72acf08772e53 100644 (file)
--- 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 744e05eb41e174bcf69b472e877d2144c48fc6bc..1e54b02e2697b32933e5a4ec5adef6021ed2ed78 100644 (file)
--- 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;