Remove enforcer & all W_ attack functions from the monster code

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

diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc
index 93cbe663cd8e594ebbd471541f65d1bf1369199a..48845d457ed627a76b761952ce4e65ffa95e8468 100644 (file)
--- a/qcsrc/server/monsters/monster/knight.qc
+++ b/qcsrc/server/monsters/monster/knight.qc
@@ -12,7 +12,7 @@ string KNIGHT_MODEL = "models/monsters/knight.mdl";
 // cvars
 float autocvar_g_monster_knight;
 float autocvar_g_monster_knight_health;
-//float autocvar_g_monster_knight_melee_damage;
+float autocvar_g_monster_knight_melee_damage;
 float autocvar_g_monster_knight_speed_walk;
 float autocvar_g_monster_knight_speed_run;
 
@@ -40,14 +40,12 @@ void knight_think ()
 void knight_attack ()
 {
        float len = vlen(self.velocity);
-       
-       W_Shotgun_Attack2();
 
        monsters_setframe((len < 50) ? knight_anim_attack : knight_anim_runattack);
        
        self.attack_finished_single = time + 1.25;
        
-       //monster_melee(self.enemy, autocvar_g_monster_knight_melee_damage, 0.3, DEATH_MONSTER_KNIGHT);
+       monster_melee(self.enemy, autocvar_g_monster_knight_melee_damage, 0.3, DEATH_MONSTER_KNIGHT, FALSE);
 }
 
 void knight_die ()