From: Mario <mario@smbclan.net>
Date: Wed, 16 Nov 2016 23:45:45 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64f2b309aa5be8aafb9ad2137174bb6d99aeb876;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental
---

64f2b309aa5be8aafb9ad2137174bb6d99aeb876
diff --cc qcsrc/common/monsters/monster.qh
index 5572fe910,ab644988a..8e086a085
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@@ -12,9 -12,10 +12,10 @@@ const int MON_FLAG_CRUSH = BIT(11); // 
  const int MON_FLAG_RIDE = BIT(12); // monster can be ridden in special modes
  const int MONSTER_SIZE_QUAKE = BIT(13);
  const int MONSTER_TYPE_PASSIVE = BIT(14); // doesn't target or chase enemies
+ const int MONSTER_TYPE_UNDEAD = BIT(15); // monster is by most definitions a zombie (doesn't fully die unless gibbed)
  
  // entity properties of monsterinfo:
 -.bool(int, entity actor, entity targ) monster_attackfunc;
 +.bool(int, entity actor, entity targ, .entity weaponentity) monster_attackfunc;
  
  // animations
  .vector anim_blockend;