Don't switch to trace entity (causes issues in modes where some targets should not...

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index 612affd0ce42561f3b9e649fe496aafd075886b6..f2850c1470f2fa2ea44f12d9de9dd3ce9efcd61d 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -201,6 +201,7 @@ float m_spider(float req)
                }
                case MR_INIT:
                {
+                       precache_model ("models/ice/ice.md3");
                        precache_sound ("weapons/electro_fire2.wav");
                        precache_sound ("weapons/fireball_fire.wav");
                        return TRUE;

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index f73083ba1c8c8a9b4772b3b6a8ad73c8f544b0e1..693960180183aed63764467c1b74d8d237aa4f8b 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -66,9 +66,6 @@ float monster_isvalidtarget (entity targ, entity ent)
        traceline(ent.origin, targ.origin, MOVE_NORMAL, ent);
 
        if(trace_ent != targ)
-       if(trace_ent)
-               targ = trace_ent;
-       else
                return FALSE;
 
        if(targ.vehicle_flags & VHF_ISVEHICLE)
@@ -138,6 +135,7 @@ entity FindTarget (entity ent)
 
        while(head) // find the closest acceptable target to pass to
        {
+               if(head.monster_attack)
                if(monster_isvalidtarget(head, ent))
                {
                        // if it's a player, use the view origin as reference (stolen from RadiusDamage functions in g_damage.qc)
@@ -917,6 +915,7 @@ void monster_die()
        self.movetype           = MOVETYPE_TOSS;
        self.moveto                     = self.origin;
        self.touch                      = MonsterTouch; // reset incase monster was pouncing
+       self.reset                      = func_null;
 
        if not(self.flags & FL_FLY)
                self.velocity = '0 0 0';

diff --git a/qcsrc/server/mutators/gamemode_invasion.qc b/qcsrc/server/mutators/gamemode_invasion.qc
index af717a1385a15626cd1f350813159a7430a75806..ab8bbd2f74211ddd952255e9fe711d44f63ca66c 100644 (file)
--- a/qcsrc/server/mutators/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/gamemode_invasion.qc
@@ -218,9 +218,6 @@ MUTATOR_HOOKFUNCTION(invasion_PlayerDamage)
                frag_force = '0 0 0';
        }
        
-       if(frag_attacker.flags & FL_MONSTER && frag_target.flags & FL_MONSTER && frag_attacker != frag_target)
-               frag_damage = 0;
-       
        return FALSE;
 }