Don't spam movetype if fish wasn't drowning

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 1505327c61bc5ed407e36f7a1f0e1ccdb35a20a5..95b351997832015d2515e8dcf2e07ed31ca635c8 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -484,6 +484,7 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                {
                        if(time >= self.last_trace)
                        {
+                               self.fish_wasdrowning = TRUE;
                                self.last_trace = time + 0.4;
                                
                                Damage (self, world, world, 2, DEATH_DROWN, self.origin, '0 0 0');
@@ -509,9 +510,10 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                        
                        return;
                }
-               else
+               else if(self.fish_wasdrowning)
                {
-                       self.angles = '0 0 0';
+                       self.fish_wasdrowning = FALSE;
+                       self.angles_x = 0;
                        self.movetype = MOVETYPE_WALK;
                }
        }

diff --git a/qcsrc/common/monsters/sv_monsters.qh b/qcsrc/common/monsters/sv_monsters.qh
index ad58d1909f23a8379e0b2c490f5a1f0e97d0539b..bd3c7779236e770c2caf414f550b9615999b4fea 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qh
+++ b/qcsrc/common/monsters/sv_monsters.qh
@@ -17,6 +17,8 @@ void monsters_setstatus(); // monsters.qc
 const float MONSTER_ATTACK_MELEE       = 1;
 const float MONSTER_ATTACK_RANGED      = 2;
 
+.float fish_wasdrowning; // used to reset a drowning fish's angles if it reaches water again
+
 .float candrop;
 
 .float attack_range;