Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/monsters/monster/brute.qc b/qcsrc/server/monsters/monster/brute.qc
index 7ebca8202c01e6f67dc042921a8c8d38fe9bcf37..8952d54008efa4895c406a25e6d6caaab494eca3 100644 (file)
--- a/qcsrc/server/monsters/monster/brute.qc
+++ b/qcsrc/server/monsters/monster/brute.qc
@@ -39,37 +39,25 @@ void brute_blade()
 {
        self.brute_cycles += 1;
        self.angles_y = self.angles_y + random()* 25;
-       self.delay = time + 0.2;
-       self.monster_delayedattack = brute_blade;
        
        monster_melee(self.enemy, autocvar_g_monster_brute_chainsaw_damage, 0.3, DEATH_MONSTER_BRUTE_BLADE, TRUE);
        
-       if(self.brute_cycles >= 4)
-       {
-               self.monster_delayedattack = func_null;
-               self.delay = -1;
-       }
+       if(self.brute_cycles <= 4)
+               defer(0.2, brute_blade);
 }
 
 void brute_uzi()
 {
        self.brute_cycles += 1;
        
-       if(self.brute_cycles > autocvar_g_monster_brute_attack_uzi_bullets)
-       {
-               self.monster_delayedattack = func_null;
-               self.delay = -1;
-               return;
-       }
-       
        monster_makevectors(self.enemy);
        
        W_SetupShot (self, autocvar_g_antilag_bullets && 18000 >= autocvar_g_antilag_bullets, 0, "weapons/uzi_fire.wav", CH_WEAPON_A, autocvar_g_monster_brute_attack_uzi_damage);
        fireBallisticBullet(w_shotorg, w_shotdir, 0.02, 18000, 5, autocvar_g_monster_brute_attack_uzi_damage, autocvar_g_monster_brute_attack_uzi_force, DEATH_MONSTER_BRUTE_UZI, 0, 1, 115);
        endFireBallisticBullet();
        
-       self.delay = time + 0.1;
-       self.monster_delayedattack = brute_uzi;
+       if(self.brute_cycles <= autocvar_g_monster_brute_attack_uzi_bullets)
+               defer(0.1, brute_uzi);
 }
 
 void brute_grenade_explode()
@@ -178,8 +166,7 @@ float brute_attack(float attack_type)
                        {
                                monsters_setframe(brute_anim_pain);
                                self.attack_finished_single = time + 0.8;
-                               self.delay = time + 0.1;
-                               self.monster_delayedattack = brute_uzi;
+                               defer(0.1, brute_uzi);
                        }
                        else
                        {