From ee2b4103090a2328656aa4df6d25552bfd717e1e Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 2 Sep 2013 08:12:44 +1000 Subject: [PATCH] Don't spam movetype if fish wasn't drowning --- qcsrc/common/monsters/sv_monsters.qc | 6 ++++-- qcsrc/common/monsters/sv_monsters.qh | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) 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; -- 2.39.2