# HG changeset patch # User nemo # Date 1288384297 14400 # Node ID 2897cf5730e7287b0912b33ddb8160ec872d651f # Parent e9baae83370b7825ccd7a05de846143097e5c36c This should only allow switching from portal gun and the like. diff -r e9baae83370b -r 2897cf5730e7 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)^);