]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Check both ammos before attempting to switch guns
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 20 Apr 2011 15:09:19 +0000 (18:09 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 20 Apr 2011 15:09:19 +0000 (18:09 +0300)
qcsrc/server/w_hagar.qc

index d7692561a6e8c9b9b70babf62d0d4b73f93354f2..aaefb006428933993076277e488a6301c906af16 100644 (file)
@@ -247,7 +247,7 @@ void W_Hagar_Attack2_Load (void)
                self.weapon_forbidchange = FALSE;
 
        // we aren't checking ammo during an attack, so we must do it here
-       if not(weapon_action(self.weapon, WR_CHECKAMMO2))
+       if not(weapon_action(self.weapon, WR_CHECKAMMO1) + weapon_action(self.weapon, WR_CHECKAMMO2))
        {
                W_SwitchToOtherWeapon(self);
                return;