From ea45bb5be1edcecfa396d6dd9548a1746737b295 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 1 Sep 2013 03:12:29 +1000 Subject: [PATCH] Fix some spawnflag conflicts --- qcsrc/common/monsters/monster/mage.qc | 2 +- qcsrc/common/monsters/monsters.qh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index f674f7958..a01cfeab6 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -292,7 +292,7 @@ void mage_heal() { pointparticles(particleeffectnum("healing_fx"), head.origin, '0 0 0', 1); head.health = bound(0, head.health + MON_CVAR(mage, heal_allies), head.max_health); - self.SendFlags |= MSF_STATUS; + head.SendFlags |= MSF_STATUS; } } diff --git a/qcsrc/common/monsters/monsters.qh b/qcsrc/common/monsters/monsters.qh index 59ed8f2f0..962a810bc 100644 --- a/qcsrc/common/monsters/monsters.qh +++ b/qcsrc/common/monsters/monsters.qh @@ -9,13 +9,13 @@ entity get_monsterinfo(float id); // special spawn flags -const float MONSTER_RESPAWN_DEATHPOINT = 2; // re-spawn where we died -const float MONSTER_TYPE_FLY = 4; -const float MONSTER_TYPE_SWIM = 8; -const float MONSTER_SIZE_BROKEN = 16; // TODO: remove when bad models are replaced -const float MON_FLAG_SUPERMONSTER = 32; // incredibly powerful monster -const float MON_FLAG_RANGED = 64; // monster shoots projectiles -const float MON_FLAG_MELEE = 128; +const float MONSTER_RESPAWN_DEATHPOINT = 16; // re-spawn where we died +const float MONSTER_TYPE_FLY = 32; +const float MONSTER_TYPE_SWIM = 64; +const float MONSTER_SIZE_BROKEN = 128; // TODO: remove when bad models are replaced +const float MON_FLAG_SUPERMONSTER = 256; // incredibly powerful monster +const float MON_FLAG_RANGED = 512; // monster shoots projectiles +const float MON_FLAG_MELEE = 1024; // entity properties of monsterinfo: .float monsterid; // MON_... -- 2.39.2