From 8fa8744659b9f15317db5641e8ccb08b87349b36 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Wed, 13 Apr 2011 02:08:31 +0300 Subject: [PATCH] Actually, forbid throwing the hagar at all while loading it! --- qcsrc/server/cl_weapons.qc | 4 ++++ qcsrc/server/w_hagar.qc | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc index 04f6185bf..6deb23c42 100644 --- a/qcsrc/server/cl_weapons.qc +++ b/qcsrc/server/cl_weapons.qc @@ -295,6 +295,10 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce) if(!W_IsWeaponThrowable(w)) return; + // don't allow throwing the hager if we're loading rockets into it + if(self.weapon == WEP_HAGAR && self.hagar_load) + return; + wb = W_WeaponBit(w); if(self.weapons & wb != wb) return; diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc index fda056e06..3ab783636 100644 --- a/qcsrc/server/w_hagar.qc +++ b/qcsrc/server/w_hagar.qc @@ -330,14 +330,6 @@ float w_hagar(float req) if(self.hagar_load && autocvar_g_balance_hagar_secondary_load_releasedeath) W_Hagar_Attack2_Load_Release(); } - else if (req == WR_DROP) - { - if(self.hagar_load) - { - W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_secondary_ammo * self.hagar_load * -1, autocvar_g_balance_hagar_reload_ammo); // give back ammo if necessary - self.hagar_load = 0; - } - } else if (req == WR_RELOAD) { W_Reload(min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav"); -- 2.39.2