Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authornemo
Fri, 05 Nov 2010 11:51:56 -0400
changeset 4122 c80434d6f314
parent 4120 0aba28eb8e34 (diff)
parent 4121 22b1acc0e461 (current diff)
child 4123 7d0f0720f50b
merge
Binary file QTfrontend/res/btnAISurvival.png has changed
Binary file QTfrontend/res/btnInfAttack.png has changed
Binary file QTfrontend/res/btnResetHealth.png has changed
--- 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
hedgewars