hedgewars: comparison hedgewars/uLandGraphics.pas

equal deleted inserted replaced

-:7a474fcc343d
+:caa57115d7ea
 procedure drawPixelEBC(landX, landY, pixelX, pixelY: Longint); inline;
 begin
 if ((Land[landY, landX] and lfBasic) <> 0) or ((Land[landY, landX] and lfObject) <> 0) then
 begin
 LandPixels[pixelY, pixelX]:= ExplosionBorderColor;
-Land[landY, landX]:= (Land[landY, landX] or lfDamaged) and not lfIce;
+Land[landY, landX]:= (Land[landY, landX] or lfDamaged) and (not lfIce);
 LandDirty[landY div 32, landX div 32]:= 1;
 end;
 end;
 function isLandscapeEdge(weight:Longint):boolean; inline;
 (j > LAND_HEIGHT -1) then
 begin
 result := 9;
 exit;
 end;
-if Land[j, i] and lfLandMask and not lfIce = 0 then
+if Land[j, i] and lfLandMask and (not lfIce) = 0 then
 result := result + 1;
 end;
 end;
 LandPixels[pixelY, pixelX]:= addBgColor(w, IceColor);
 LandPixels[pixelY, pixelX]:= addBgColor(LandPixels[pixelY, pixelX], icePixels^[iceSurface^.w * (pixelY mod iceSurface^.h) + (pixelX mod iceSurface^.w)])
 end
 else
 begin
-LandPixels[pixelY, pixelX]:= IceColor and not AMask or $E8 shl AShift;
+LandPixels[pixelY, pixelX]:= IceColor and (not AMask) or $E8 shl AShift;
 LandPixels[pixelY, pixelX]:= addBgColor(LandPixels[pixelY, pixelX], icePixels^[iceSurface^.w * (pixelY mod iceSurface^.h) + (pixelX mod iceSurface^.w)]);
 // silly workaround to avoid having to make background erasure a tadb it smarter about sea ice
 if LandPixels[pixelY, pixelX] and AMask shr AShift = 255 then
-LandPixels[pixelY, pixelX]:= LandPixels[pixelY, pixelX] and not AMask or 254 shl AShift;
+LandPixels[pixelY, pixelX]:= LandPixels[pixelY, pixelX] and (not AMask) or 254 shl AShift;
 end;
 end;
 procedure DrawPixelIce(landX, landY, pixelX, pixelY: Longint); inline;
 begin
 if ((Land[landY, landX] and lfIce) <> 0) then exit;
 if isLandscapeEdge(getPixelWeight(landX, landY)) then
 begin
 if (LandPixels[pixelY, pixelX] and AMask < 255) and (LandPixels[pixelY, pixelX] and AMask > 0) then
-LandPixels[pixelY, pixelX] := (IceEdgeColor and not AMask) or (LandPixels[pixelY, pixelX] and AMask)
+LandPixels[pixelY, pixelX] := (IceEdgeColor and (not AMask)) or (LandPixels[pixelY, pixelX] and AMask)
 else if (LandPixels[pixelY, pixelX] and AMask < 255) or (Land[landY, landX] > 255) then
 LandPixels[pixelY, pixelX] := IceEdgeColor
 end
 else if Land[landY, landX] > 255 then
 begin
 fillPixelFromIceSprite(pixelX, pixelY);
 end;
-if Land[landY, landX] > 255 then Land[landY, landX] := Land[landY, landX] or lfIce and not lfDamaged;
+if Land[landY, landX] > 255 then Land[landY, landX] := Land[landY, landX] or lfIce and (not lfDamaged);
 end;
 function FillLandCircleLine(y, fromPix, toPix: LongInt; fill : fillType): Longword;
 var px, py, i: LongInt;
 procedure ChangeRoundInLand(X, Y, Radius: LongInt; doSet, isCurrent: boolean);
 begin
 if not doSet and isCurrent then
 FillRoundInLand(X, Y, Radius, setNotCurrentMask)
-else if not doSet and not IsCurrent then
+else if not doSet and (not IsCurrent) then
 FillRoundInLand(X, Y, Radius, changePixelSetNotCurrent)
 else if doSet and IsCurrent then
 FillRoundInLand(X, Y, Radius, setCurrentHog)
-else if doSet and not IsCurrent then
+else if doSet and (not IsCurrent) then
 FillRoundInLand(X, Y, Radius, changePixelNotSetNotCurrent);
 end;
 procedure DrawIceBreak(x, y, iceRadius, iceHeight: Longint);
 var
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= ExplosionBorderColor
 else
 LandPixels[ty div 2, tx div 2]:= ExplosionBorderColor;
-Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and not lfIce;
+Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
 LandDirty[ty div 32, tx div 32]:= 1;
 end;
 inc(y, dY)
 end;
 tx:= hwRound(X);
 ty:= hwRound(Y);
 if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (((Land[ty, tx] and lfBasic) <> 0)
 or ((Land[ty, tx] and lfObject) <> 0)) then
 begin
-Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and not lfIce;
+Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
 if despeckle then
 LandDirty[ty div 32, tx div 32]:= 1;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= ExplosionBorderColor
 else
 ty:= hwRound(Y);
 if ((ty and LAND_HEIGHT_MASK) = 0)
 and ((tx and LAND_WIDTH_MASK) = 0)
 and (((Land[ty, tx] and lfBasic) <> 0) or ((Land[ty, tx] and lfObject) <> 0)) then
 begin
-Land[ty, tx]:= Land[ty, tx] and not lfIce;
+Land[ty, tx]:= Land[ty, tx] and (not lfIce);
 if despeckle then
 begin
 Land[ty, tx]:= Land[ty, tx] or lfDamaged;
 LandDirty[ty div 32, tx div 32]:= 1
 end;
 tx:= hwRound(X);
 ty:= hwRound(Y);
 if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (((Land[ty, tx] and lfBasic) <> 0)
 or ((Land[ty, tx] and lfObject) <> 0)) then
 begin
-Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and not lfIce;
+Land[ty, tx]:= (Land[ty, tx] or lfDamaged) and (not lfIce);
 if despeckle then
 LandDirty[ty div 32, tx div 32]:= 1;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= ExplosionBorderColor
 else

branch	webgl
changeset 8839	caa57115d7ea
parent 8833	c13ebed437cb
child 8841	338f7c2bac2c