hedgewars: comparison hedgewars/uCollisions.pas

equal deleted inserted replaced

-:c9fec197335a
+:b2ed495a7fb1
 for i:= 0 to Pred(Count) do
 with cinfos[i] do
 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
 (sqr(mx - x) + sqr(my - y) <= sqr(Radius + Gear^.Radius + 2)) then
 begin
 for i:= 0 to Pred(Count) do
 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
 with cGear^ do
 begin