From: Mario Date: Thu, 18 Apr 2013 07:14:48 +0000 (+1000) Subject: Also block DPCONTENTS_MONSTERCLIP X-Git-Tag: xonotic-v0.8.0~241^2^2~351 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf4d55973fc9f44ac971a0c97cf0343bd3457fad;p=xonotic%2Fxonotic-data.pk3dir.git Also block DPCONTENTS_MONSTERCLIP --- diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc index 13907f99a..f234e900c 100644 --- a/qcsrc/server/monsters/lib/monsters.qc +++ b/qcsrc/server/monsters/lib/monsters.qc @@ -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; diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qc b/qcsrc/server/mutators/gamemode_towerdefense.qc index a9faffe2b..e47f13aa7 100644 --- a/qcsrc/server/mutators/gamemode_towerdefense.qc +++ b/qcsrc/server/mutators/gamemode_towerdefense.qc @@ -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