Fix some fish & tarbaby issues

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 4ae1fd56af5889d9d95beb597de98194c544a8b3..7409b2df3150c1f208fc408fe2bc927a70f1322c 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -509,8 +509,9 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                        if(time >= self.last_trace)
                        {
                                self.last_trace = time + 0.4;
-                               self.angles = '0 0 -90';
+                               
                                Damage (self, world, world, 2, DEATH_DROWN, self.origin, '0 0 0');
+                               self.angles = '90 90 0';
                                if(random() < 0.5)
                                {
                                        self.velocity_y += random() * 50;
@@ -521,10 +522,15 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
                                        self.velocity_y -= random() * 50;
                                        self.velocity_x += random() * 50;
                                }
-                               //self.velocity_z += random() * 150;
-                               self.movetype = MOVETYPE_BOUNCE;
-                               self.velocity_z = -200;
+                               self.velocity_z += random() * 150;
                        }
+                               
+                       
+                       self.movetype = MOVETYPE_BOUNCE;
+                       //self.velocity_z = -200;
+                               
+                       self.SendFlags |= MSF_MOVE | MSF_ANG;
+                       
                        return;
                }
                else

diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc
index 4acbf3775b8748dcb7839a930e59b9c90db087ff..0ad255346f92a2160e54115977feb074470e3ce4 100644 (file)
--- a/qcsrc/server/monsters/monster/tarbaby.qc
+++ b/qcsrc/server/monsters/monster/tarbaby.qc
@@ -93,6 +93,9 @@ void tarbaby_explode()
 {
        tarbaby_blowup();
        
+       self.think = Monster_Fade;
+       self.nextthink = time + 0.1;
+       
        monster_hook_death(); // calling this next frame should be ok...
 }
 
@@ -103,6 +106,11 @@ void tarbaby_die ()
        self.event_damage   = func_null;
        self.movetype           = MOVETYPE_NONE;
        self.enemy                      = world;
+       self.health                     = 0;
+       
+       WaypointSprite_Kill(self.sprite);
+       
+       self.SendFlags          |= MSF_MOVE | MSF_STATUS;
 }
 
 void tarbaby_spawn ()