From e49ebf3a1a9d96e4a3f63d37cc5f8d012d3d8362 Mon Sep 17 00:00:00 2001 From: Sahil Singhal Date: Tue, 10 May 2011 01:09:33 -0400 Subject: [PATCH] Code for the melee weapons. --- qcsrc/server/cl_player.qc | 2 ++ qcsrc/server/cl_weaponsystem.qc | 7 +++++-- qcsrc/server/defs.qh | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 3426c4ce5..a8a752269 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -188,6 +188,7 @@ void player_setupanimsformodel() self.anim_forwardleft = '20 1 1'; self.anim_backright = '21 1 1'; self.anim_backleft = '22 1 1'; + self.anim_melee = '23 1 1'; animparseerror = FALSE; animfilename = strcat(self.model, ".animinfo"); animfile = fopen(animfilename, FILE_READ); @@ -214,6 +215,7 @@ void player_setupanimsformodel() self.anim_forwardleft = animparseline(animfile); self.anim_backright = animparseline(animfile); self.anim_backleft = animparseline(animfile); + self.anim_melee = animparseline(animfile); fclose(animfile); // derived anims diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index f9543785b..1ac1f78bf 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -1258,7 +1258,10 @@ void weapon_thinkf(float fr, float t, void() func) if (!self.crouch) // shoot anim stands up, this looks bad { local vector anim; - anim = self.anim_shoot; + if(self.weapon == WEP_SHOTGUN && self.BUTTON_ATCK2) + anim = self.anim_melee; + else + anim = self.anim_shoot; anim_z = anim_y / (t + sys_frametime); setanim(self, anim, FALSE, TRUE, TRUE); } @@ -1734,4 +1737,4 @@ void W_Reload(float sent_ammo_min, float sent_ammo_amount, float sent_time, stri self.clip_load = 0; self.old_clip_load = self.clip_load; self.clip_load = self.weapon_load[self.weapon] = -1; -} \ No newline at end of file +} diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 2090c22b4..f6ddad269 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -148,6 +148,7 @@ float maxclients; .vector anim_forwardleft; // player running forward and left .vector anim_backright; // player running backward and right .vector anim_backleft; // player running back and left +.vector anim_melee; // player doing the melee action // weapon animation vectors: .vector anim_fire1; -- 2.39.2