Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / mage.qc

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index e308b618e6cff76b7998e71a460eba9a3d7fb702..fdba5c0a98e20b87a41e6c9d413f455af638ff0c 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -67,7 +67,7 @@ float friend_needshelp(entity e)
                return FALSE;
        if(vlen(e.origin - self.origin) > MON_CVAR(mage, heal_range))
                return FALSE;
-       if(IsDifferentTeam(e, self))
+       if(DIFF_TEAM(e, self))
                return FALSE;
        if(e.frozen)
                return FALSE;
@@ -448,7 +448,9 @@ float m_mage(float req)
                }
                case MR_INIT:
                {
-                       // nothing
+                       precache_model ("models/items/g_h50.md3");
+                       precache_model ("models/ctf/shield.md3");
+                       precache_sound ("weapons/grenade_impact.wav");
                        return TRUE;
                }
                case MR_CONFIG:
@@ -475,9 +477,6 @@ float m_mage(float req)
                case MR_INIT:
                {
                        precache_model ("models/monsters/mage.dpm");
-                       precache_model ("models/items/g_h50.md3");
-                       precache_model ("models/ctf/shield.md3");
-                       precache_sound ("weapons/grenade_impact.wav");
                        return TRUE;
                }
        }