Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/common/monsters/monster/brute.qc b/qcsrc/common/monsters/monster/brute.qc
index a78813beea413037e4bfe69f60771be7b379e11b..91a307bdff0b60bb6842fe84423b8522bd34e715 100644 (file)
--- a/qcsrc/common/monsters/monster/brute.qc
+++ b/qcsrc/common/monsters/monster/brute.qc
@@ -2,7 +2,7 @@
 REGISTER_MONSTER(
 /* MON_##id   */ BRUTE,
 /* function   */ m_brute,
-/* spawnflags */ 0,
+/* spawnflags */ MON_FLAG_MELEE | MON_FLAG_RANGED,
 /* mins,maxs  */ '-36 -36 -20', '36 36 50',
 /* model      */ "ogre.dpm",
 /* netname    */ "brute",
@@ -45,7 +45,7 @@ void brute_blade()
        self.brute_cycles += 1;
        self.angles_y = self.angles_y + random()* 25;
        
-       monster_melee(self.enemy, MON_CVAR(brute, attack_chainsaw_damage), self.attack_range, DEATH_MONSTER_BRUTE_BLADE, TRUE);
+       monster_melee(self.enemy, MON_CVAR(brute, attack_chainsaw_damage), brute_anim_swing, self.attack_range, 0, DEATH_MONSTER_BRUTE_BLADE, TRUE);
        
        if(self.brute_cycles <= 4)
                defer(0.2, brute_blade);
@@ -159,7 +159,6 @@ float brute_attack(float attack_type)
                case MONSTER_ATTACK_MELEE:
                {
                        self.brute_cycles = 0;
-                       monsters_setframe(brute_anim_swing);
                        self.attack_finished_single = time + 1.3;
                        brute_blade();
                        
@@ -231,7 +230,9 @@ float m_brute(float req)
                }
                case MR_INIT:
                {
-                       // nothing
+                       precache_sound ("weapons/uzi_fire.wav");
+                       precache_sound ("weapons/grenade_impact.wav");
+                       precache_sound ("weapons/grenade_fire.wav");
                        return TRUE;
                }
                case MR_CONFIG: