X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster.qh;h=841e7ef4026f49e6443d6d0d1973a5a3f4a4f663;hb=a4d0783ffcee158676f0f875be2b42737559a324;hp=ab644988aa4d1192e60fde95bb97f28da642c0d3;hpb=26693a3ac060825ce6c7f170d4e65f7ac2a1fb25;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh index ab644988a..841e7ef40 100644 --- a/qcsrc/common/monsters/monster.qh +++ b/qcsrc/common/monsters/monster.qh @@ -13,9 +13,10 @@ 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) +const int MON_FLAG_HIDDEN = BIT(16); // 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; @@ -37,9 +38,9 @@ CLASS(Monster, Object) /** model */ ATTRIB(Monster, m_model, entity); /** hitbox size */ - ATTRIB(Monster, mins, vector, '-0 -0 -0'); + ATTRIB(Monster, m_mins, vector, '-0 -0 -0'); /** hitbox size */ - ATTRIB(Monster, maxs, vector, '0 0 0'); + ATTRIB(Monster, m_maxs, vector, '0 0 0'); /** (SERVER) setup monster data */ METHOD(Monster, mr_setup, bool(Monster this, entity actor)) { TC(Monster, this); return false; }