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.
allow kicking of barrels
authorsheepluva
Mon, 03 May 2010 18:25:25 +0000
changeset 3411 30d0d780d605
parent 3410 6748602cb878
child 3412 9ed6a97a8853
allow kicking of barrels
hedgewars/uCollisions.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/uCollisions.pas	Mon May 03 14:59:42 2010 +0000
+++ b/hedgewars/uCollisions.pas	Mon May 03 18:25:25 2010 +0000
@@ -210,7 +210,7 @@
       if (Gear <> cGear) and
          (sqr(mx - x) + sqr(my - y) <= sqr(Radius + Gear^.Radius + 2)) and
          ((mx > x) xor (Dir > 0)) then
-         if (cGear^.Kind in [gtHedgehog, gtMine]) and ((Gear^.State and gstNotKickable) = 0) then
+         if (cGear^.Kind in [gtHedgehog, gtMine, gtExplosives]) and ((Gear^.State and gstNotKickable) = 0) then
              begin
              with cGear^ do
                   begin
@@ -262,7 +262,7 @@
       if (Gear <> cGear) and
          (sqr(mx - x) + sqr(my - y) <= sqr(Radius + Gear^.Radius + 2)) and
          ((my > y) xor (Dir > 0)) then
-         if (cGear^.Kind in [gtHedgehog, gtMine]) and ((Gear^.State and gstNotKickable) = 0) then
+         if (cGear^.Kind in [gtHedgehog, gtMine, gtExplosives]) and ((Gear^.State and gstNotKickable) = 0) then
              begin
              with cGear^ do
                   begin
hedgewars