sheepy-clone: comparison hedgewars/uLandGraphics.pas

equal deleted inserted replaced

-:1b2bbc86af5b
+:3682db294dae
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= LandBackPixel(i, t)
 else
 LandPixels[t div 2, i div 2]:= LandBackPixel(i, t)
 end
-else if not isMap or ((Land[t, i] and lfObject) <> 0) then
+else
-begin
+if ((Land[t, i] and lfObject) <> 0) then
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= 0
 else
-LandPixels[t div 2, i div 2]:= 0
+LandPixels[t div 2, i div 2]:= 0;
-end;
 t:= y - dy;
 if (t and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if ((Land[t, i] and lfBasic) <> 0) then
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= LandBackPixel(i, t)
 else
 LandPixels[t div 2, i div 2]:= LandBackPixel(i, t)
 end
-else if not isMap or ((Land[t, i] and lfObject) <> 0) then
+else
+if ((Land[t, i] and lfObject) <> 0) then
+if (cReducedQuality and rqBlurryLand) = 0 then
+LandPixels[t, i]:= 0
+else
+LandPixels[t div 2, i div 2]:= 0;
+t:= y + dx;
+if (t and LAND_HEIGHT_MASK) = 0 then
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
+if ((Land[t, i] and lfBasic) <> 0) then
 begin
+inc(cnt);
 if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[t, i]:= 0
+LandPixels[t, i]:= LandBackPixel(i, t)
 else
-LandPixels[t div 2, i div 2]:= 0
+LandPixels[t div 2, i div 2]:= LandBackPixel(i, t)
-end;
+end
+else
-t:= y + dx;
+if ((Land[t, i] and lfObject) <> 0) then
+if (cReducedQuality and rqBlurryLand) = 0 then
+LandPixels[t, i]:= 0
+else
+LandPixels[t div 2, i div 2]:= 0;
+t:= y - dx;
 if (t and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if ((Land[t, i] and lfBasic) <> 0) then
 begin
 inc(cnt);
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= LandBackPixel(i, t)
 else
 LandPixels[t div 2, i div 2]:= LandBackPixel(i, t)
 end
-else if not isMap or ((Land[t, i] and lfObject) <> 0) then
+else
-begin
+if ((Land[t, i] and lfObject) <> 0) then
 if (cReducedQuality and rqBlurryLand) = 0 then
-	    LandPixels[t, i]:= 0
+LandPixels[t, i]:= 0
 else
-	    LandPixels[t div 2, i div 2]:= 0
+LandPixels[t div 2, i div 2]:= 0;
-end;
-t:= y - dx;
-if (t and LAND_HEIGHT_MASK) = 0 then
-for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
-if ((Land[t, i] and lfBasic) <> 0) then
-begin
-inc(cnt);
-if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[t, i]:= LandBackPixel(i, t)
-else
-LandPixels[t div 2, i div 2]:= LandBackPixel(i, t)
-end
-else if not isMap or ((Land[t, i] and lfObject) <> 0) then
-begin
-if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[t, i]:= 0
-else
-LandPixels[t div 2, i div 2]:= 0
-end;
 FillLandCircleLinesBG:= cnt;
 end;
 procedure FillLandCircleLinesEBC(x, y, dx, dy: LongInt);
 var i, t: LongInt;
 begin
 t:= y + dy;
 if (t and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
-if (Land[t, i] and (lfBasic or lfObject)) <> 0 then
+if ((Land[t, i] and lfBasic) <> 0) or ((Land[t, i] and lfObject) <> 0) then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= cExplosionBorderColor
 else
 LandPixels[t div 2, i div 2]:= cExplosionBorderColor;
 end;
 t:= y - dy;
 if (t and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
-if (Land[t, i] and (lfBasic or lfObject)) <> 0 then
+if ((Land[t, i] and lfBasic) <> 0) or ((Land[t, i] and lfObject) <> 0) then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= cExplosionBorderColor
 else
 LandPixels[t div 2, i div 2]:= cExplosionBorderColor;
 end;
 t:= y + dx;
 if (t and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
-if (Land[t, i] and (lfBasic or lfObject)) <> 0 then
+if ((Land[t, i] and lfBasic) <> 0) or ((Land[t, i] and lfObject) <> 0) then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= cExplosionBorderColor
 else
 LandPixels[t div 2, i div 2]:= cExplosionBorderColor;
 end;
 t:= y - dx;
 if (t and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
-if (Land[t, i] and (lfBasic or lfObject)) <> 0 then
+if ((Land[t, i] and lfBasic) <> 0) or ((Land[t, i] and lfObject) <> 0) then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= cExplosionBorderColor
 else
 LandPixels[t div 2, i div 2]:= cExplosionBorderColor;
 if (Land[ty, tx] and lfBasic) <> 0 then
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= LandBackPixel(tx, ty)
 else
 LandPixels[ty div 2, tx div 2]:= LandBackPixel(tx, ty)
-else if not isMap then
+else
-begin
+if (Land[ty, tx] and lfObject) <> 0 then
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= 0
 else
-LandPixels[ty div 2, tx div 2]:= 0
+LandPixels[ty div 2, tx div 2]:= 0;
-end;
 inc(y, dY)
 end;
 inc(Radius, 4);
 dec(y, Count * dY);
 for i:= 0 to Pred(Count) do
 begin
 for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do
 for tx:= Max(0, ar^[i].Left - Radius) to Min(LAND_WIDTH, ar^[i].Right + Radius) do
-if (Land[ty, tx] and (lfBasic or lfObject)) <> 0 then
+if ((Land[ty, tx] and lfBasic) <> 0) or ((Land[ty, tx] and lfObject) <> 0) then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
 else
 LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor;
 Y:= Y + dY;
 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 or lfObject)) <> 0) then
+(((Land[ty, tx] and lfBasic) <> 0) or
+((Land[ty, tx] and lfObject) <> 0)) then
 begin
 Land[ty, tx]:= Land[ty, tx] or lfDamaged;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
 else
 LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 Y:= Y + dY;
 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 or lfObject)) <> 0) then
+(((Land[ty, tx] and lfBasic) <> 0) or
+((Land[ty, tx] and lfObject) <> 0)) then
 begin
 Land[ty, tx]:= Land[ty, tx] or lfDamaged;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
-	    else
+else
 LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 X:= nx;
 Y:= ny;
 for t:= 0 to ticks do
 if (Land[ty, tx] and lfBasic) <> 0 then
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= LandBackPixel(tx, ty)
 else
 LandPixels[ty div 2, tx div 2]:= LandBackPixel(tx, ty)
-else if not isMap or ((Land[ty, tx] and lfObject) <> 0) then
+else
-begin
+if (Land[ty, tx] and lfObject) <> 0 then
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= 0
 else
-LandPixels[ty div 2, tx div 2]:= 0
+LandPixels[ty div 2, tx div 2]:= 0;
-end;
 Land[ty, tx]:= 0;
 end
 end;
 for t:= 0 to 7 do
 Y:= Y + dY;
 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 or lfObject)) <> 0) then
+(((Land[ty, tx] and lfBasic) <> 0) or
+((Land[ty, tx] and lfObject) <> 0)) then
 begin
 Land[ty, tx]:= Land[ty, tx] or lfDamaged;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
 else
 LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
 Y:= Y + dY;
 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 or lfObject)) <> 0) then
+(((Land[ty, tx] and lfBasic) <> 0) or
+((Land[ty, tx] and lfObject) <> 0)) then
 begin
 Land[ty, tx]:= Land[ty, tx] or lfDamaged;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
 else
 LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
 UpdateLandTexture(x, w, y, h)
 end;
 // was experimenting with applying as damage occurred.
 function Despeckle(X, Y: LongInt): boolean;
-var nx, ny, i, j, c, xx, yy: LongInt;
+var nx, ny, i, j, c: LongInt;
-pixelsweep: boolean;
+begin
-begin
+if ((Land[Y, X] and lfDamaged) <> 0) and ((Land[Y, X] and lfIndestructible) = 0) then // check neighbours
-if (cReducedQuality and rqBlurryLand) = 0 then
-begin
-xx:= X;
-yy:= Y;
-end
-else
-begin
-xx:= X div 2;
-yy:= Y div 2;
-end;
-pixelsweep:= not isMap and ((Land[Y, X] and $FF00) = 0) and (LandPixels[yy, xx] <> 0);
-if (((Land[Y, X] and lfDamaged) <> 0) and ((Land[Y, X] and lfIndestructible) = 0)) or pixelsweep then
 begin
 c:= 0;
 for i:= -1 to 1 do
 for j:= -1 to 1 do
 if (i <> 0) or (j <> 0) then
 begin
 ny:= Y + i;
 nx:= X + j;
 if ((ny and LAND_HEIGHT_MASK) = 0) and ((nx and LAND_WIDTH_MASK) = 0) then
-begin
+if Land[ny, nx] > 255 then
-if pixelsweep then
+inc(c);
-begin
-if ((cReducedQuality and rqBlurryLand) <> 0) then
-begin
-nx:= nx div 2;
-ny:= ny div 2
-end;
-if LandPixels[ny, nx] <> 0 then inc(c);
-end
-else if Land[ny, nx] > 255 then inc(c);
-end
 end;
 if c < 4 then // 0-3 neighbours
 begin
+if (cReducedQuality and rqBlurryLand) = 0 then
 if (Land[Y, X] and lfBasic) <> 0 then
-LandPixels[yy, xx]:= LandBackPixel(X, Y)
+LandPixels[Y, X]:= LandBackPixel(X, Y)
-else LandPixels[yy, xx]:= 0;
+else
+LandPixels[Y, X]:= 0
+else
+if (Land[Y, X] and lfBasic) <> 0 then
+LandPixels[Y div 2, X div 2]:= LandBackPixel(X, Y)
+else
+LandPixels[Y div 2, X div 2]:= 0;
 Land[Y, X]:= 0;
 exit(true);
 end;
 end;

changeset 4686	3682db294dae
parent 4659	ce5897f53072
child 4688	f63433ba3064