]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
No shooting while reloading
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 28 Feb 2011 16:10:21 +0000 (18:10 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 28 Feb 2011 16:10:21 +0000 (18:10 +0200)
data/qcsrc/server/w_grabber.qc

index 4e39d096dea0ea11ad30e0a2b2b73453146d14d0..047f00663556b7e9019bf1306b06da2ac34dbfcc 100644 (file)
@@ -82,7 +82,7 @@ float w_grabber(float req)
                        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
                }\r
-               else\r
+               else if not(self.clip_load < 0) // we're currently reloading\r
                {\r
                        if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))\r
                        {\r