diff -r 453a1c29b7e4 -r 1833dadcebf0 hedgewars/uLandObjects.pas --- a/hedgewars/uLandObjects.pas Thu Nov 28 00:41:35 2013 +0400 +++ b/hedgewars/uLandObjects.pas Thu Nov 28 21:13:49 2013 -0500 @@ -128,10 +128,7 @@ LandPixels[(cpY + y) div 2, (cpX + x) div 2]:= p^[x]; if (Land[cpY + y, cpX + x] <= lfAllObjMask) and ((p^[x] and AMask) <> 0) then - begin - Land[cpY + y, cpX + x]:= lfObject; - Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] or extraFlags - end; + Land[cpY + y, cpX + x]:= lfObject or extraFlags end; p:= @(p^[Image^.pitch shr 2]) end; @@ -280,7 +277,7 @@ rr.x:= x1; while rr.x < x2 do begin - // For testing only. Intent is to flag this on objects with masks, or use it for an ice ray gun + // I should theme flag this. also snow... if (Theme = 'Snow') or (Theme = 'Christmas') then BlitImageAndGenerateCollisionInfo(rr.x, y, min(x2 - rr.x, tmpsurf^.w), tmpsurf, lfIce) else