Mercurial Mercurial > hedgewars-draft / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorsheepluva
Sat, 29 Nov 2014 05:25:34 +0100
changeset 10568 5a867053add8
parent 10558 b574f04c9685 (diff)
parent 10566 cc90ea6448c7 (current diff)
child 10570 a781c9dc27ec
merge
--- a/hedgewars/uGearsUtils.pas	Sat Nov 29 05:24:47 2014 +0100
+++ b/hedgewars/uGearsUtils.pas	Sat Nov 29 05:25:34 2014 +0100
@@ -1038,7 +1038,7 @@
                         end;
                     if dmg > 0 then
                         begin
-                        if (Gear^.Kind <> gtHedgehog) or (t^.Hedgehog^.Effects[heInvulnerable] = 0) then
+                        if (t^.Kind <> gtHedgehog) or (t^.Hedgehog^.Effects[heInvulnerable] = 0) then
                             ApplyDamage(t, Gear^.Hedgehog, dmg, dsBullet)
                         else
                             Gear^.State:= Gear^.State or gstWinner;
hedgewars-draft