# HG changeset patch
# User nemo
# Date 1311451663 14400
# Node ID 25d3784dc0f661913883e563d23c37a666b534b0
# Parent  3134fafcfe125c87513d2260d265c7800a38d232
test on i should be first condition

diff -r 3134fafcfe12 -r 25d3784dc0f6 hedgewars/HHHandlers.inc
--- a/hedgewars/HHHandlers.inc	Sat Jul 23 09:31:57 2011 +0400
+++ b/hedgewars/HHHandlers.inc	Sat Jul 23 16:07:43 2011 -0400
@@ -77,7 +77,7 @@
             ammoidx:= -1;
             //TryDo(i < 2, 'Engine bug: no ammo in current slot', true)
             end;
-        until ((Ammo^[slot, ammoidx].Count > 0) and (Team^.Clan^.TurnNumber > Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns)) or (i = 1)
+        until (i = 1) or ((Ammo^[slot, ammoidx].Count > 0) and (Team^.Clan^.TurnNumber > Ammoz[Ammo^[slot, ammoidx].AmmoType].SkipTurns))
         end 
     else
         begin