hedgewars/uLandGraphics.pas
branchios-develop
changeset 13418 ba39a1d396c0
parent 13410 4c813650fe17
child 13468 f1d349a52bc7
--- a/hedgewars/uLandGraphics.pas	Sun Jun 10 18:56:51 2018 +0200
+++ b/hedgewars/uLandGraphics.pas	Sun Jun 10 19:12:26 2018 +0200
@@ -795,9 +795,11 @@
                     begin
                     if (LandFlags and lfBasic <> 0) or 
                        ((LandPixels[gY, gX] and AMask shr AShift > 128) and  // This test assumes lfBasic and lfObject differ only graphically
-                         (LandFlags and lfObject = 0)) then
+                         (LandFlags and (lfObject or lfIce) = 0)) then
                          Land[cpY + y, cpX + x]:= lfBasic or LandFlags
-                    else Land[cpY + y, cpX + x]:= lfObject or LandFlags
+                    else if (LandFlags and lfIce = 0) then
+						 Land[cpY + y, cpX + x]:= lfObject or LandFlags
+					else Land[cpY + y, cpX + x]:= LandFlags
                     end;
                 if (not behind) or (LandPixels[gY, gX] = 0) then
                     begin