X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmonsters%2Fmonster.qh;h=aba9c9aa9b66713607aa3f2c4d02412744b82e51;hb=94f293de630d6173c5303adf65e45d4f4a83863a;hp=8e086a085c62218ba68ee20cc7107f933f9da320;hpb=cbca1a79315fe08c4796273a490a4d12b7d3291d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh index 8e086a085..aba9c9aa9 100644 --- a/qcsrc/common/monsters/monster.qh +++ b/qcsrc/common/monsters/monster.qh @@ -13,6 +13,7 @@ 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, .entity weaponentity) monster_attackfunc; @@ -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; } @@ -47,8 +48,6 @@ CLASS(Monster, Object) METHOD(Monster, mr_think, bool(Monster this, entity actor)) { TC(Monster, this); return false; } /** (SERVER) called when monster dies */ METHOD(Monster, mr_death, bool(Monster this, entity actor)) { TC(Monster, this); return false; } - /** (BOTH) precaches models/sounds used by this monster */ - METHOD(Monster, mr_precache, bool(Monster this)) { TC(Monster, this); return false; } /** (SERVER) called when monster is damaged */ METHOD(Monster, mr_pain, float(Monster this, entity actor, float damage_take, entity attacker, float deathtype)) { TC(Monster, this); return damage_take; } /** (BOTH?) sets animations for monster */