Fix some spawnflag conflicts

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index f674f79580b4a9c5f2d2ef88cf0ead7086138d4d..a01cfeab65d96836bb44a8bb0941995b9c421aec 100644 (file)
--- 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 59ed8f2f097f3828ea7ad75a88219a0b658464c7..962a810bc2fc5882c9dec3fa4412da7ecefcb70f 100644 (file)
--- 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_...