Add a check just incase the mutator deletes the item entity

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

diff --git a/qcsrc/common/monsters/monster/stingray.qc b/qcsrc/common/monsters/monster/stingray.qc
index dc11f84678000accafd2a64851b9b54cb0df46f2..5a53356176146dd13e3f7bb63a5b04ebdc06f846 100644 (file)
--- a/qcsrc/common/monsters/monster/stingray.qc
+++ b/qcsrc/common/monsters/monster/stingray.qc
@@ -2,7 +2,7 @@
 REGISTER_MONSTER(
 /* MON_##id   */ STINGRAY,
 /* function   */ m_stingray,
-/* spawnflags */ MONSTER_TYPE_SWIM | MONSTER_SIZE_BROKEN,
+/* spawnflags */ MONSTER_TYPE_SWIM | MONSTER_SIZE_BROKEN | MON_FLAG_MELEE,
 /* mins,maxs  */ '-20 -20 -31', '20 20 20',
 /* model      */ "fish.mdl",
 /* netname    */ "stingray",
@@ -33,13 +33,13 @@ float stingray_attack(float attack_type)
        {
                case MONSTER_ATTACK_MELEE:
                {
-                       monsters_setframe(stingray_anim_attack);
-                       self.attack_finished_single = time + MON_CVAR(stingray, attack_bite_delay);
-                       monster_melee(self.enemy, MON_CVAR(stingray, attack_bite_damage), 0.1, DEATH_MONSTER_STINGRAY, FALSE);
-                       
-                       return TRUE;
+                       return monster_melee(self.enemy, MON_CVAR(stingray, attack_bite_damage), stingray_anim_attack, self.attack_range, MON_CVAR(stingray, attack_bite_delay), DEATH_MONSTER_STINGRAY, FALSE);
                }
                case MONSTER_ATTACK_RANGED:
+               {
+                       // no ranged attack for stingray (yet?)
+                       return FALSE;
+               }
        }
        
        return FALSE;