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.
real collision fix
authoralfadur
Wed, 24 Jun 2020 20:24:12 +0300
changeset 15631 b2ed495a7fb1
parent 15630 c9fec197335a
child 15632 25132742a948
real collision fix
hedgewars/uCollisions.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uCollisions.pas	Wed Jun 24 19:50:58 2020 +0300
+++ b/hedgewars/uCollisions.pas	Wed Jun 24 20:24:12 2020 +0300
@@ -530,7 +530,7 @@
             if  (Gear <> cGear) and
                 ((mx > x) xor (Dir > 0)) and
                 (
-                  ((cGear^.Kind in [gtHedgehog, gtMine, gtKnife]) and ((Gear^.State and gstNotKickable) = 0)) or
+                  ((cGear^.Kind in [gtHedgehog, gtMine, gtKnife]) and ((cGear^.State and gstNotKickable) = 0)) or
                 // only apply X kick if the barrel is knocked over
                   ((cGear^.Kind = gtExplosives) and ((cGear^.State and gsttmpflag) <> 0))
                 ) and
@@ -594,7 +594,7 @@
         with cinfos[i] do
             if (Gear <> cGear) and
                ((myr > y) xor (Dir > 0)) and
-               (Gear^.State and gstNotKickable = 0) and
+               (cGear^.State and gstNotKickable = 0) and
                (cGear^.Kind in [gtHedgehog, gtMine, gtKnife, gtExplosives]) and
                (sqr(mx - x) + sqr(my - y) <= sqr(Radius + Gear^.Radius + 2)) then
                     begin
hedgewars