Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/common/monsters/monster/cerberus.qc b/qcsrc/common/monsters/monster/cerberus.qc
index 689f04254cff4760d9abf9dcb7649aab6463b255..fabaa5a8eba0141b8998e37d65768207c94a22fe 100644 (file)
--- a/qcsrc/common/monsters/monster/cerberus.qc
+++ b/qcsrc/common/monsters/monster/cerberus.qc
@@ -2,7 +2,7 @@
 REGISTER_MONSTER(
 /* MON_##id   */ CERBERUS,
 /* function   */ m_cerberus,
-/* spawnflags */ 0,
+/* spawnflags */ MON_FLAG_MELEE,
 /* mins,maxs  */ '-16 -16 -24', '16 16 12',
 /* model      */ "dog.dpm",
 /* netname    */ "cerberus",
@@ -43,7 +43,7 @@ void cerberus_findowner()
        if(head.monsterid == MON_BRUISER)
        if(findentity(world, monster_owner, head) == world)
        if(vlen(head.origin - self.origin) < self.target_range)
-       if(!IsDifferentTeam(head, self))
+       if(SAME_TEAM(head, self))
        if(head.enemy == world)
        {
                self.monster_owner = head;
@@ -64,7 +64,7 @@ void cerberus_checkowner()
                self.monster_owner = world;
        if(self.monster_owner.health < 1)
                self.monster_owner = world;
-       if(IsDifferentTeam(self.monster_owner, self))
+       if(DIFF_TEAM(self.monster_owner, self))
                self.monster_owner = world;
                
        self.cerberus_last_trace = time + 3;
@@ -89,17 +89,12 @@ float cerberus_attack(float attack_type)
        {
                case MONSTER_ATTACK_MELEE:
                {
-                       monsters_setframe(cerberus_anim_attack);
-                       self.attack_finished_single = time + 0.7;
-                       monster_melee(self.enemy, MON_CVAR(cerberus, attack_bite_damage), 0.2, DEATH_MONSTER_CERBERUS_BITE, TRUE);
-                       
-                       return TRUE;
+                       return monster_melee(self.enemy, MON_CVAR(cerberus, attack_bite_damage), cerberus_anim_attack, self.attack_range, 0.7, DEATH_MONSTER_CERBERUS_BITE, TRUE);
                }
                case MONSTER_ATTACK_RANGED:
                {
                        makevectors(self.angles);
-                       if(monster_leap(cerberus_anim_attack, cerberus_touch_jump, v_forward * 300 + '0 0 200', 0.8))
-                               return TRUE;
+                       return monster_leap(cerberus_anim_attack, cerberus_touch_jump, v_forward * 300 + '0 0 200', 0.8);
                }
        }