From 8909ba9af468512252c7e2fa200493f13b4f6a12 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 1 Feb 2010 14:46:53 +0100 Subject: [PATCH] rcalpistol: only primary is halfautomatic --- data/qcsrc/server/w_rcalpistol.qc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/data/qcsrc/server/w_rcalpistol.qc b/data/qcsrc/server/w_rcalpistol.qc index f91538acc..b818a8e64 100644 --- a/data/qcsrc/server/w_rcalpistol.qc +++ b/data/qcsrc/server/w_rcalpistol.qc @@ -156,6 +156,7 @@ float w_rcalpistol(float req) else { self.rcalpistol_accumulator = bound(time - cvar("g_balance_rcalpistol_bursttime"), self.rcalpistol_accumulator, time); + if(self.rcalpistol_release) { if (self.BUTTON_ATCK) @@ -167,18 +168,18 @@ float w_rcalpistol(float req) self.rcalpistol_accumulator += cvar("g_balance_rcalpistol_primary_burstcost"); self.rcalpistol_release = 0; } - if (self.BUTTON_ATCK2) - if (time >= self.rcalpistol_accumulator + cvar("g_balance_rcalpistol_secondary_burstcost")) - if (weapon_prepareattack(1, cvar("g_balance_rcalpistol_secondary_refire"))) - { - W_RCalPistol_Attack2(); - weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_rcalpistol_secondary_animtime"), W_RCalPistol_CheckReloadAndReady); - self.rcalpistol_accumulator += cvar("g_balance_rcalpistol_secondary_burstcost"); - self.rcalpistol_release = 0; - } } - if not(self.BUTTON_ATCK || self.BUTTON_ATCK2) + if not(self.BUTTON_ATCK) self.rcalpistol_release = 1; + + if (self.BUTTON_ATCK2) + if (time >= self.rcalpistol_accumulator + cvar("g_balance_rcalpistol_secondary_burstcost")) + if (weapon_prepareattack(1, cvar("g_balance_rcalpistol_secondary_refire"))) + { + W_RCalPistol_Attack2(); + weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_rcalpistol_secondary_animtime"), W_RCalPistol_CheckReloadAndReady); + self.rcalpistol_accumulator += cvar("g_balance_rcalpistol_secondary_burstcost"); + } } } else if (req == WR_PRECACHE) -- 2.39.2