Remove unused neutral check from target validation & remove unnecessary enemy checks...

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

diff --git a/qcsrc/server/monsters/monster/fish.qc b/qcsrc/server/monsters/monster/fish.qc
index 970fd47e386bd35d0c098128c057930910d299e1..def58600db9b38e29973fe56dec21f841545a14c 100644 (file)
--- a/qcsrc/server/monsters/monster/fish.qc
+++ b/qcsrc/server/monsters/monster/fish.qc
@@ -18,7 +18,7 @@ float autocvar_g_monster_fish_speed_run;
 void fish_think ()
 {
        self.think = fish_think;
-       self.nextthink = time + 0.3;
+       self.nextthink = time + 0.1;
        
        monster_move(autocvar_g_monster_fish_speed_run, autocvar_g_monster_fish_speed_walk, 10, fish_anim_swim, fish_anim_swim, fish_anim_swim);
 }
@@ -30,7 +30,7 @@ void fish_attack ()
        self.frame = fish_anim_attack;
        self.attack_finished_single = time + 0.5;
 
-       monster_melee(self.enemy, bigdmg * monster_skill, 60, DEATH_MONSTER_FISH_BITE);
+       monster_melee(self.enemy, bigdmg * monster_skill, 60, DEATH_MONSTER_FISH);
 }
 
 void fish_die ()
@@ -41,7 +41,6 @@ void fish_die ()
        self.takedamage         = DAMAGE_NO;
        self.event_damage   = func_null;
        self.enemy                      = world;
-       self.pain_finished  = self.nextthink;
        self.frame                      = fish_anim_death;
        self.think                      = Monster_Fade;
        self.nextthink          = time + 2.1;
@@ -68,11 +67,7 @@ void fish_spawn ()
 
 void spawnfunc_monster_fish ()
 {      
-       if not(autocvar_g_monster_fish)
-       {
-               remove(self);
-               return;
-       }
+       if not(autocvar_g_monster_fish) { remove(self); return; }
        
        self.monster_spawnfunc = spawnfunc_monster_fish;