diff -r d4c12b7c7bb9 -r 746de1d303d2 hedgewars/uGears.pas --- a/hedgewars/uGears.pas Fri Sep 02 16:15:37 2011 -0400 +++ b/hedgewars/uGears.pas Fri Sep 02 19:06:05 2011 -0400 @@ -944,7 +944,7 @@ end; if delay2 = 0 then begin - if (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.State and gstAttacked = 0) then SweepDirty; + if (CurrentHedgehog^.Gear <> nil) and (CurrentHedgehog^.Gear^.State and gstAttacked = 0) and (CurAmmoGear = nil) then SweepDirty; CheckNoDamage; AliveCount:= 0; // shorter version of check for win to allow typical step activity to proceed for i:= 0 to Pred(ClansCount) do