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.
tweak prev commit
authorsheepluva
Sun, 09 Aug 2015 00:25:35 +0200
changeset 11040 3ab93d702fb1
parent 11039 cd4b0851b060
child 11041 598fa14a3a1a
tweak prev commit
hedgewars/uGearsHandlersMess.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uGearsHandlersMess.pas	Sun Aug 09 00:19:33 2015 +0200
+++ b/hedgewars/uGearsHandlersMess.pas	Sun Aug 09 00:25:35 2015 +0200
@@ -5228,15 +5228,15 @@
             //tmp^.State:= tmp^.State or gstFlatened;
             if (tmp^.Kind <> gtHedgehog) or (tmp^.Hedgehog^.Effects[heInvulnerable] = 0) then
                 begin
-                // do 1/2 current hp worth of damage if extra damage is enabled (1/3 damage if not)
-                if cDamageModifier > _1 then
-                    d:= 2
-                else
-                    d:= 3;
                 // base damage on remaining health
                 dmg:= (tmp^.Health - tmp^.Damage);
                 if dmg > 0 then
                     begin
+                    // do 1/2 current hp worth of damage if extra damage is enabled (1/3 damage if not)
+                    if cDamageModifier > _1 then
+                        d:= 2
+                    else
+                        d:= 3;
                     // always round up
                     if dmg mod d > 0 then
                         dmg:= dmg div d + 1
hedgewars