diff -r 6340fa683746 -r 368669bf6cb3 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Tue Sep 13 21:15:23 2011 +0400
+++ b/hedgewars/GSHandlers.inc	Tue Sep 13 17:49:39 2011 -0400
@@ -2713,7 +2713,7 @@
         repeat
             CurrentTeam^.CurrHedgehog := Succ(CurrentTeam^.CurrHedgehog) mod (CurrentTeam^.
                                          HedgehogsNumber);
-        until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil);
+        until (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear <> nil) and (CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog].Gear^.Damage = 0);
 
         CurrentHedgehog := @CurrentTeam^.Hedgehogs[CurrentTeam^.CurrHedgehog];