# HG changeset patch
# User nemo
# Date 1502295725 14400
# Node ID 28bf941e13a01ebdd7d277f2df2ea13560967f06
# Parent  832b969ea00c1399ef29ee3c6bce5f8a7a55052f
don't spawn things on ice.  it's too unpredictable what'll happen to them

diff -r 832b969ea00c -r 28bf941e13a0 hedgewars/uGearsUtils.pas
--- a/hedgewars/uGearsUtils.pas	Sun Jul 30 19:06:57 2017 -0400
+++ b/hedgewars/uGearsUtils.pas	Wed Aug 09 12:22:05 2017 -0400
@@ -881,7 +881,7 @@
                     inc(y, 2);
                 until (y >= cWaterLine) or
                         ((not ignoreOverlap) and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, $FFFF) = 0)) or
-                        (ignoreOverlap and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, lfLandMask) = 0));
+                        (ignoreOverlap and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, lfLandMask and (not lfIce)) = 0));
 
                 sy:= y;
 
@@ -889,7 +889,7 @@
                     inc(y);
                 until (y >= cWaterLine) or
                         ((not ignoreOverlap) and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, $FFFF) <> 0)) or
-                        (ignoreOverlap and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, lfLandMask) <> 0));
+                        (ignoreOverlap and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, lfLandMask and (not lfIce)) <> 0));
 
                 if (y - sy > Gear^.Radius * 2) and (y < cWaterLine)
                     and (((Gear^.Kind = gtExplosives)