Fix a bug with the grabber hook not spawning if shooting it right after reload

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 89d2013781a14cd28f95bfe75ead637bc04a52ef..f0d34e0ee366bdcc842b2d86806bdb562469220e 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -249,7 +249,8 @@ float w_grabber(float req)
        }\r
        else if (req == WR_RELOAD)\r
        {\r
-               self.grabber_state |= GRABBER_REMOVING;\r
+               if(self.clip_load >= 0) // prevents a bug\r
+                       self.grabber_state |= GRABBER_REMOVING;\r
                W_Reload(min(cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_secondary_ammo")), cvar("g_balance_grabber_reload_ammo"), cvar("g_balance_grabber_reload_time"), "weapons/reload.wav");\r
        }\r
        else if (req == WR_SUICIDEMESSAGE)\r

diff --git a/docs/Release notes.txt b/docs/Release notes.txt
index c5315827caa21f642bcb2002a31a2a0b1e6f4d21..a81a3e55b24a93b3b0721069f3306804d0e3f7a9 100644 (file)
--- a/docs/Release notes.txt
+++ b/docs/Release notes.txt
@@ -274,6 +274,8 @@ Bug fixes:
 \r
 - Holding the Regurgitate button down would cause the process to loop infinitely, which could also cause bots to get stuck trying to throw up.\r
 \r
+- If holding the alt fire button while reloading, the grabber would fire the hook (and take ammo) after reload, but the hook would not spawn.\r
+\r
 Features:\r
 \r
 - There is no longer a player swallow limit. Players have a stomach capacity (for predators) and a mass (for prey), both based on player scale. As long as your mass is not exceeded, you can keep swallowing players. This affects your weight and overall player capacity based on player size as well. eg: You might be able to eat only one large player, three tiny players, or two normal sized players at the same time. Stomach size will also reflect your capacity, not the player count, being bigger or smaller based on the prey inside and their size compared to yours. By default, a macro can swallow up to 15 mircos and a micro up to 1 macro.\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 7c87f7eeeb4e38c270b1d69d3ed443529526b636..00ef8d879f998c5856055d5ac76b39e1ed00b51e 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -108,8 +108,6 @@
 \r
 - 0.7 | 0.8: Use R_SetProperty instead of R_SetView\r
 \r
-- 0.7 BUG: If holding the alt fire button down while reloading, the grabber will attempt to fire the hook after reload (and take ammo), but the hook will not spawn.\r
-\r
 - 0.7 BUG: Swallow model gets bumped outside of the view at times. This is likely due to the change to offset the original weapon viewmodel.\r
 \r
 - 0.7 | 0.8: Do the Desertfactory textures have metal footsteps where they need to?\r