Use monster_leap for tarbaby jumping

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index ada0dd8002c0369452ddc1821e92c02216e80363..35bb12cbb7a086ecc255f0a9b8d0c1507d25ff4c 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -292,7 +292,7 @@ void ClientCommand_mobspawn(float request, float argc)
                                makevectors(self.v_angle);
                                WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 150, MOVE_NORMAL, self);
                        
-                               e = spawnmonster(tospawn, self, self, trace_endpos, TRUE, moveflag);
+                               e = spawnmonster(tospawn, self, self, trace_endpos, FALSE, moveflag);
                                if(mname) e.netname = strzone(mname);
                        
                                sprint(self, strcat("Spawned 1 ", tospawn, "\n"));

diff --git a/qcsrc/server/monsters/monster/tarbaby.qc b/qcsrc/server/monsters/monster/tarbaby.qc
index a1edfbd7f5d0f9862502607fd1733b44d748f7ee..d119b0f477909234d00b680a5d22975b232364ab 100644 (file)
--- a/qcsrc/server/monsters/monster/tarbaby.qc
+++ b/qcsrc/server/monsters/monster/tarbaby.qc
@@ -56,19 +56,8 @@ void Tar_JumpTouch ()
 
 void tarbaby_jump ()
 {
-       if not(self.flags & FL_ONGROUND)
-               return;
-       monsters_setframe(tarbaby_anim_jump);
-       self.movetype = MOVETYPE_BOUNCE;
-       self.touch = Tar_JumpTouch;
-       makevectors (self.angles);
-       self.origin_z += 1;
-       self.velocity = v_forward * 600 + '0 0 200';
-       self.velocity_z += random()*150;
-       if (self.flags & FL_ONGROUND)
-               self.flags -= FL_ONGROUND;
-               
-       self.attack_finished_single = time + 0.5;
+       makevectors(self.angles);
+       monster_leap(tarbaby_anim_jump, Tar_JumpTouch, v_forward * 600 + '0 0 200', 0.5);
 }
 
 float tbaby_jump ()