This should only allow switching from portal gun and the like.
authornemo
Fri, 29 Oct 2010 16:31:37 -0400
changeset 4015 2897cf5730e7
parent 4014 e9baae83370b
child 4016 daaf120328f2
This should only allow switching from portal gun and the like.
hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Fri Oct 29 13:19:33 2010 -0400
+++ b/hedgewars/HHHandlers.inc	Fri Oct 29 16:31:37 2010 -0400
@@ -54,7 +54,7 @@
     while (ammoidx < cMaxSlotAmmoIndex) and (Ammo^[slot, ammoidx].AmmoType <> CurAmmoType) do inc(ammoidx);
 
     if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or
-       ((MultiShootAttacks > 0) and (CurAmmoGear <> nil) and ((Ammoz[CurAmmoGear^.AmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0)) or
+       ((MultiShootAttacks > 0) and ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) = 0)) or
        ((Gear^.State and gstHHDriven) = 0) then exit;
 
     if ((Ammoz[CurAmmoType].Ammo.Propz and ammoprop_NoRoundEndHint) <> 0) and (MultiShootAttacks > 0) then OnUsedAmmo(PHedgehog(Gear^.Hedgehog)^);