From: Mario <mario.mario@y7mail.com>
Date: Sun, 1 Sep 2013 22:12:44 +0000 (+1000)
Subject: Don't spam movetype if fish wasn't drowning
X-Git-Tag: xonotic-v0.8.0~241^2^2~102
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee2b4103090a2328656aa4df6d25552bfd717e1e;p=xonotic%2Fxonotic-data.pk3dir.git

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 1505327c6..95b351997 100644
--- 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 ad58d1909..bd3c77792 100644
--- 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;