Fix an issue with the grabber reloading

[voretournament/voretournament.git] / data / qcsrc / server / w_grabber.qc

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 50b6addb6fe8ddb1a97b2ab1eeabfd58812cea9e..7e931f33f4d3f74502488e1adbb3d4295782ad2f 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -69,10 +69,7 @@ void spawnfunc_weapon_grabber (void)
 float w_grabber(float req)\r
 {\r
        if(self.stat_eaten) // we can't use weapons while in the stomach\r
-       {\r
                self.grabber_state |= GRABBER_REMOVING;\r
-               return FALSE;\r
-       }\r
 \r
        float ammo_amount;\r
        float grabbered_time_max, grabbered_fuel;\r
@@ -86,7 +83,7 @@ float w_grabber(float req)
                grabbered_fuel = cvar("g_balance_grabber_primary_grabbered_fuel");\r
                // forced reload\r
                if(cvar("g_balance_grabber_reload_ammo") && self.clip_load < min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo"))\r
-               && !(self.clip_load >= (time - self.grabber_time_fueldecrease) * grabbered_fuel && self.BUTTON_ATCK)) // not while hooked and still have ammo to stay hooked\r
+               && self.clip_load >= 0 && !(self.clip_load >= (time - self.grabber_time_fueldecrease) * grabbered_fuel && self.BUTTON_ATCK)) // not while hooked and still have ammo to stay hooked\r
                {\r
                        if(self.ammo_fuel >= 1) // we only have one weapon in VT, so nothing else to switch to if we're out of ammo\r
                                weapon_action(self.weapon, WR_RELOAD);\r
@@ -95,6 +92,8 @@ float w_grabber(float req)
                {\r
                        if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1))\r
                        {\r
+                               if(self.stat_eaten) // we can't use weapons while in the stomach\r
+                                       return FALSE;\r
                                if(time < self.weapon_delay)\r
                                        return FALSE;\r
 \r
@@ -113,6 +112,9 @@ float w_grabber(float req)
                        }\r
                        if (self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO2))\r
                        {\r
+                       \r
+                               if(self.stat_eaten) // we can't use weapons while in the stomach\r
+                                       return FALSE;\r
                                if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))\r
                                {\r
                                        W_Grabber_Attack2();\r
@@ -174,30 +176,19 @@ float w_grabber(float req)
                        self.grabber_time_fueldecrease = time + cvar("g_balance_grabber_primary_grabbered_time_free");\r
                }\r
 \r
-               if (self.BUTTON_CROUCH)\r
+               self.grabber_state |= GRABBER_PULLING;\r
+               self.grabber_state &~= GRABBER_RELEASING;\r
+\r
+               if (self.BUTTON_ATCK)\r
                {\r
-                       self.grabber_state &~= GRABBER_PULLING;\r
-                       if (self.BUTTON_ATCK)\r
-                               self.grabber_state &~= GRABBER_RELEASING;\r
-                       else\r
-                               self.grabber_state |= GRABBER_RELEASING;\r
+                       // already fired\r
+                       if(self.grabber)\r
+                               self.grabber_state |= GRABBER_WAITING_FOR_RELEASE;\r
                }\r
                else\r
                {\r
-                       self.grabber_state |= GRABBER_PULLING;\r
-                       self.grabber_state &~= GRABBER_RELEASING;\r
-\r
-                       if (self.BUTTON_ATCK)\r
-                       {\r
-                               // already fired\r
-                               if(self.grabber)\r
-                                       self.grabber_state |= GRABBER_WAITING_FOR_RELEASE;\r
-                       }\r
-                       else\r
-                       {\r
-                               self.grabber_state |= GRABBER_REMOVING;\r
-                               self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;\r
-                       }\r
+                       self.grabber_state |= GRABBER_REMOVING;\r
+                       self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;\r
                }\r
        }\r
        else if (req == WR_PRECACHE)\r
@@ -224,20 +215,26 @@ float w_grabber(float req)
        {\r
                if(self.grabber)\r
                {\r
-                       ammo_amount = self.ammo_fuel > 0;\r
-                       ammo_amount += self.weapon_load[WEP_GRABBER] > 0;\r
+                       if(cvar("g_balance_grabber_reload_ammo"))\r
+                               ammo_amount = self.weapon_load[WEP_GRABBER] > 0;\r
+                       else\r
+                               ammo_amount = self.ammo_fuel > 0;\r
                }\r
                else\r
                {\r
-                       ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_primary_ammo");\r
-                       ammo_amount += self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_primary_ammo");\r
+                       if(cvar("g_balance_grabber_reload_ammo"))\r
+                               ammo_amount = self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_primary_ammo");\r
+                       else\r
+                               ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_primary_ammo");\r
                }\r
                return ammo_amount;\r
        }\r
        else if (req == WR_CHECKAMMO2)\r
        {\r
-               ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_secondary_ammo");\r
-               ammo_amount += self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_secondary_ammo");\r
+               if(cvar("g_balance_grabber_reload_ammo"))\r
+                       ammo_amount = self.weapon_load[WEP_GRABBER] >= cvar("g_balance_grabber_secondary_ammo");\r
+               else\r
+                       ammo_amount = self.ammo_fuel >= cvar("g_balance_grabber_secondary_ammo");\r
                return ammo_amount;\r
        }\r
        else if (req == WR_RELOAD)\r