From 373615c182d8975725c15396f14ddcb1b858fa47 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 16 Apr 2013 13:00:05 +1000 Subject: [PATCH] Use monster_leap for tarbaby jumping --- qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/monsters/monster/tarbaby.qc | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index ada0dd800..35bb12cbb 100644 --- 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 a1edfbd7f..d119b0f47 100644 --- 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 () -- 2.39.2