# HG changeset patch
# User nemo
# Date 1288972316 14400
# Node ID c80434d6f314b40d85a47a91ce0ab3a945c560d3
# Parent  0aba28eb8e34451185d38a02ed683146c369ba6e# Parent  22b1acc0e461599d484317b54cb21b5295c9382e
merge

diff -r 22b1acc0e461 -r c80434d6f314 QTfrontend/res/btnAISurvival.png
Binary file QTfrontend/res/btnAISurvival.png has changed
diff -r 22b1acc0e461 -r c80434d6f314 QTfrontend/res/btnInfAttack.png
Binary file QTfrontend/res/btnInfAttack.png has changed
diff -r 22b1acc0e461 -r c80434d6f314 QTfrontend/res/btnResetHealth.png
Binary file QTfrontend/res/btnResetHealth.png has changed
diff -r 22b1acc0e461 -r c80434d6f314 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Fri Nov 05 16:07:39 2010 +0100
+++ b/hedgewars/uGears.pas	Fri Nov 05 11:51:56 2010 -0400
@@ -627,7 +627,7 @@
 Gear:= GearsList;
 while Gear <> nil do
     begin
-    if Gear^.Kind = gtHedgehog then
+    if (Gear^.Kind = gtHedgehog) and (((GameFlags and gfInfAttack) = 0) or ((Gear^.dX.QWordValue < _0_000004.QWordValue) and (Gear^.dY.QWordValue < _0_000004.QWordValue))) then
         begin
         if (not isInMultiShoot) then inc(Gear^.Damage, Gear^.Karma);
         if (Gear^.Damage <> 0) and