]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Also block DPCONTENTS_MONSTERCLIP
authorMario <mario.mario@y7mail.com>
Thu, 18 Apr 2013 07:14:48 +0000 (17:14 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 18 Apr 2013 07:14:48 +0000 (17:14 +1000)
qcsrc/server/monsters/lib/monsters.qc
qcsrc/server/mutators/gamemode_towerdefense.qc

index 13907f99a7df26b384e0ea8f49adbc3597978dce..f234e900c5ac1ba7a85d4cbd8945b8d5f503eb2e 100644 (file)
@@ -1011,7 +1011,7 @@ float monster_initialize(string  net_name, float mon_id,
        self.oldtarget2                 = self.target2;
        self.deadflag                   = DEAD_NO; // UNDEAD
        self.noalign                    = !nodrop;
-       self.dphitcontentsmask  = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP;
+       self.dphitcontentsmask  = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_MONSTERCLIP;
        
        if not(self.ticrate)
                self.ticrate = autocvar_g_monsters_think_delay;
index a9faffe2b0fe0b2b1fb875002baa07132977f4cc..e47f13aa7194c340b787a58815d785fef4ee4946 100644 (file)
@@ -812,7 +812,7 @@ MUTATOR_HOOKFUNCTION(td_MonsterSpawn)
        
        if(self.drop_size < 1) self.drop_size = 1;
        
-       self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_CORPSE;
+       self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_BOTCLIP | DPCONTENTS_CORPSE | DPCONTENTS_MONSTERCLIP;
        
        self.origin += '0 0 25'; // hopefully this fixes monsters falling through the floor