Actually, create a weapon independent function that forbids the player to change...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_weapons.qc

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 6deb23c4209574fbec662e34bc025fc1911abd51..4df6655b7caae298981acf13ea09ed8b14b9b215 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -284,6 +284,8 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
        w = self.weapon;
        if (w == 0)
                return; // just in case
+       if(self.weapon_forbidchange)
+               return;
        if(MUTATOR_CALLHOOK(ForbidThrowCurrentWeapon))
                return;
        if(!autocvar_g_weapon_throwable)
@@ -295,10 +297,6 @@ 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;