An added check to make sure we can only fire when we have enough ammo (an issue due...

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index b9ac88cce7e4ada1a296f67eee44ba43f164f966..30d7131c4901d74e0df3712d7656fe1c4bbb5f66 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -87,7 +87,7 @@ float w_grabber(float req)
                }\r
                else if not(self.clip_load < 0) // we're not currently reloading\r
                {\r
                }\r
                else if not(self.clip_load < 0) // we're not currently reloading\r
                {\r

-                       if (self.BUTTON_ATCK)\r
+                       if (self.BUTTON_ATCK && weapon_action(self.weapon, WR_CHECKAMMO1))\r

                        {\r
                                if(time < self.weapon_delay)\r
                                        return FALSE;\r
                        {\r
                                if(time < self.weapon_delay)\r
                                        return FALSE;\r


@@ -105,7 +105,7 @@ float w_grabber(float req)
                                        weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);                               \r
                                }\r
                        }\r
                                        weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);                               \r
                                }\r
                        }\r

-                       if (self.BUTTON_ATCK2)\r
+                       if (self.BUTTON_ATCK2 && weapon_action(self.weapon, WR_CHECKAMMO2))\r

                        {\r
                                if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))\r
                                {\r
                        {\r
                                if (weapon_prepareattack(1, cvar("g_balance_grabber_secondary_refire")))\r
                                {\r