diff -r c6597b65caea -r d86618629e20 hedgewars/uLand.pas --- a/hedgewars/uLand.pas Mon Oct 26 10:39:20 2009 +0000 +++ b/hedgewars/uLand.pas Thu Oct 29 17:51:54 2009 +0000 @@ -610,7 +610,7 @@ for y:= 0 to LAND_HEIGHT - 1 do begin for x:= 0 to LAND_WIDTH - 1 do - if Land[y, x] <> 0 then LandPixels[y, x]:= p^[x] or $FF000000; + if Land[y, x] <> 0 then LandPixels[y, x]:= p^[x] or AMask; p:= @(p^[Surface^.pitch div 4]); end; @@ -686,11 +686,11 @@ begin for x:= 0 to Pred(tmpsurf^.w) do begin - if (($FF000000 and p^[x]) = 0) then // Tiy was having trouble generating transparent black + if ((AMask and p^[x]) = 0) then // Tiy was having trouble generating transparent black Land[cpY + y, cpX + x]:= 0 - else if p^[x] = $FF0000FF then + else if p^[x] = (AMask or RMask) then Land[cpY + y, cpX + x]:= COLOR_INDESTRUCTIBLE - else if p^[x] = $FFFFFFFF then + else if p^[x] = (AMask or RMask or GMask or BMask) then Land[cpY + y, cpX + x]:= COLOR_LAND; end; @@ -788,9 +788,9 @@ Land[y, leftX + w]:= COLOR_INDESTRUCTIBLE; Land[y, rightX - w]:= COLOR_INDESTRUCTIBLE; if (y + w) mod 32 < 16 then - c:= $FF000000 + c:= AMask else - c:= $FF00FFFF; + c:= AMask or RMask or GMask; LandPixels[y, leftX + w]:= c; LandPixels[y, rightX - w]:= c; end; @@ -799,9 +799,9 @@ begin Land[topY + w, x]:= COLOR_INDESTRUCTIBLE; if (x + w) mod 32 < 16 then - c:= $FF000000 + c:= AMask else - c:= $FF00FFFF; + c:= AMask or RMask or GMask; LandPixels[topY + w, x]:= c; end; end;