Mercurial Mercurial > hedgewars-draft / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uCollisions.pas
changeset 15744 498c1482dec2
parent 15696 f5b127ee3196
child 15929 128ace913837 
--- a/hedgewars/uCollisions.pas	Sun Jul 12 01:08:42 2020 +0300
+++ b/hedgewars/uCollisions.pas	Sun Jul 12 01:27:27 2020 +0300
@@ -671,7 +671,7 @@
             if (Gear <> info.cGear)
                 and ((centerX > info.X) xor (Dir > 0))
                 and ((info.cGear^.State and gstNotKickable) = 0)
-                and ((info.cGear^.Kind in [gtHedgehog, gtMine, gtKnife])
+                and ((info.cGear^.Kind in [gtHedgehog, gtMine, gtKnife, gtSentry])
                     or (info.cGear^.Kind = gtExplosives) and ((info.cGear^.State and gsttmpflag) <> 0)) // only apply X kick if the barrel is knocked over
                 and (sqr(centerX - info.X) + sqr(centerY - info.Y) <= sqr(info.Radius + Gear^.Radius + 2)) then
             begin
@@ -718,7 +718,7 @@
             if (Gear <> info.cGear)
                 and ((centerY + Gear^.Radius > info.Y) xor (Dir > 0))
                 and (info.cGear^.State and gstNotKickable = 0)
-                and (info.cGear^.Kind in [gtHedgehog, gtMine, gtKnife, gtExplosives])
+                and (info.cGear^.Kind in [gtHedgehog, gtMine, gtKnife, gtExplosives, gtSentry])
                 and (sqr(centerX - info.X) + sqr(centerY - info.Y) <= sqr(info.Radius + Gear^.Radius + 2)) then
             begin
                 with info.cGear^ do
hedgewars-draft