hedgewars: comparison hedgewars/uLandGraphics.pas

equal deleted inserted replaced

-:fc52f7c22c9b
+:6155187bf599
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if (Land[y + dy, i] and lfIndestructible) = 0 then
 Land[y + dy, i]:= Value;
 if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if (Land[y - dy, i] and lfIndestructible) = 0 then
 Land[y - dy, i]:= Value;
 if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if (Land[y + dx, i] and lfIndestructible) = 0 then
 procedure ChangeCircleLines(x, y, dx, dy: LongInt; doSet: boolean);
 var i: LongInt;
 begin
 if not doSet then
 begin
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
 for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
-if (Land[y + dy, i] > 0) and (Land[y + dy, i] < 256) then dec(Land[y + dy, i]); // check > 0 because explosion can erase collision data
+if (Land[y + dy, i] > 0) and (Land[y + dy, i] < 256) then
-if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
+dec(Land[y + dy, i]); // check > 0 because explosion can erase collision data
-for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
+if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-if (Land[y - dy, i] > 0) and (Land[y - dy, i] < 256) then dec(Land[y - dy, i]);
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
-if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
+if (Land[y - dy, i] > 0) and (Land[y - dy, i] < 256) then
-for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
+dec(Land[y - dy, i]);
-if (Land[y + dx, i] > 0) and (Land[y + dx, i] < 256) then dec(Land[y + dx, i]);
+if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
-if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
-for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
+if (Land[y + dx, i] > 0) and (Land[y + dx, i] < 256) then
-if (Land[y - dx, i] > 0) and (Land[y - dx, i] < 256) then dec(Land[y - dx, i]);
+dec(Land[y + dx, i]);
-end else
+if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
-begin
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
-if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
+if (Land[y - dx, i] > 0) and (Land[y - dx, i] < 256) then
-for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
+dec(Land[y - dx, i]);
-if (Land[y + dy, i] < 256) then
+end
-inc(Land[y + dy, i]);
+else
-if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
+begin
-for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
+if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
-if (Land[y - dy, i] < 256) then
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
-inc(Land[y - dy, i]);
+if (Land[y + dy, i] < 256) then
-if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
+inc(Land[y + dy, i]);
-for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
+if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-if (Land[y + dx, i] < 256) then
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
-inc(Land[y + dx, i]);
+if (Land[y - dy, i] < 256) then
-if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
+inc(Land[y - dy, i]);
-for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
+if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
-if (Land[y - dx, i] < 256) then
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
-inc(Land[y - dx, i]);
+if (Land[y + dx, i] < 256) then
-end
+inc(Land[y + dx, i]);
+if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
+if (Land[y - dx, i] < 256) then
+inc(Land[y - dx, i]);
+end
 end;
 procedure FillRoundInLand(X, Y, Radius: LongInt; Value: Longword);
 var dx, dy, d: LongInt;
 begin
 dx:= 0;
 dy:= Radius;
 d:= 3 - 2 * Radius;
 while (dx < dy) do
 begin
 FillCircleLines(x, y, dx, dy, Value);
-if (d < 0)
+if (d < 0) then
-then d:= d + 4 * dx + 6
+d:= d + 4 * dx + 6
-else begin
+else
-d:= d + 4 * (dx - dy) + 10;
+begin
-dec(dy)
+d:= d + 4 * (dx - dy) + 10;
-end;
+dec(dy)
-inc(dx)
+end;
-end;
+inc(dx)
-if (dx = dy) then FillCircleLines(x, y, dx, dy, Value);
+end;
+if (dx = dy) then
+FillCircleLines(x, y, dx, dy, Value);
 end;
 procedure ChangeRoundInLand(X, Y, Radius: LongInt; doSet: boolean);
 var dx, dy, d: LongInt;
 begin
 dx:= 0;
 dy:= Radius;
 d:= 3 - 2 * Radius;
 while (dx < dy) do
 begin
 ChangeCircleLines(x, y, dx, dy, doSet);
-if (d < 0)
+if (d < 0) then
-then d:= d + 4 * dx + 6
+d:= d + 4 * dx + 6
-else begin
+else
-d:= d + 4 * (dx - dy) + 10;
+begin
-dec(dy)
+d:= d + 4 * (dx - dy) + 10;
-end;
+dec(dy)
-inc(dx)
+end;
-end;
+inc(dx)
-if (dx = dy) then ChangeCircleLines(x, y, dx, dy, doSet)
+end;
+if (dx = dy) then
+ChangeCircleLines(x, y, dx, dy, doSet)
 end;
 procedure FillLandCircleLines0(x, y, dx, dy: LongInt);
 var i, t: LongInt;
 begin
 cnt: Longword;
 begin
 cnt:= 0;
 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 lfIndestructible) = 0 then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
 by:= t; bx:= i;
 end
 else
 begin
 by:= t div 2; bx:= i div 2;
 end;
 if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
 begin
 inc(cnt);
 LandPixels[by, bx]:= LandBackPixel(i, t)
 end
 else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
 LandPixels[by, bx]:= 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 lfIndestructible) = 0 then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
 by:= t; bx:= i;
 end
 else
 begin
 by:= t div 2; bx:= i div 2;
 end;
 if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
 begin
 inc(cnt);
 LandPixels[by, bx]:= LandBackPixel(i, t)
 end
 else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
 LandPixels[by, bx]:= 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 lfIndestructible) = 0 then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
 by:= t; bx:= i;
 end
 else
 begin
 by:= t div 2; bx:= i div 2;
 end;
 if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
 begin
 inc(cnt);
 LandPixels[by, bx]:= LandBackPixel(i, t)
 end
 else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
 LandPixels[by, bx]:= 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 lfIndestructible) = 0 then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
 by:= t; bx:= i;
 end
 else
 begin
 by:= t div 2; bx:= i div 2;
 end;
 if ((Land[t, i] and lfBasic) <> 0) and (((LandPixels[by,bx] and AMask) shr AShift) = 255) and (not disableLandBack) then
 begin
 inc(cnt);
 LandPixels[by, bx]:= LandBackPixel(i, t)
 end
 else if ((Land[t, i] and lfObject) <> 0) or (((LandPixels[by,bx] and AMask) shr AShift) < 255) then
 LandPixels[by, bx]:= 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) <> 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;
 Land[t, i]:= Land[t, i] or lfDamaged;
 //Despeckle(i, t);
 LandDirty[t div 32, i div 32]:= 1;
 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) 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;
 Land[t, i]:= Land[t, i] or lfDamaged;
 //Despeckle(i, t);
 LandDirty[t div 32, i div 32]:= 1;
 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) 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;
 Land[t, i]:= Land[t, i] or lfDamaged;
 //Despeckle(i, t);
 LandDirty[t div 32, i div 32]:= 1;
 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) 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;
 Land[t, i]:= Land[t, i] or lfDamaged;
 //Despeckle(i, y - dy);
 LandDirty[t div 32, i div 32]:= 1;
 end;
 end;
 function DrawExplosion(X, Y, Radius: LongInt): Longword;
 var dx, dy, ty, tx, d: LongInt;
 cnt: Longword;
 d:= 3 - 2 * Radius;
 while (dx < dy) do
 begin
 inc(cnt, FillLandCircleLinesBG(x, y, dx, dy));
-if (d < 0)
+if (d < 0) then
-then d:= d + 4 * dx + 6
+d:= d + 4 * dx + 6
-else begin
+else
+begin
 d:= d + 4 * (dx - dy) + 10;
 dec(dy)
 end;
 inc(dx)
 end;
-if (dx = dy) then inc(cnt, FillLandCircleLinesBG(x, y, dx, dy));
+if (dx = dy) then
+inc(cnt, FillLandCircleLinesBG(x, y, dx, dy));
 end;
 // draw a hole in land
 if Radius > 20 then
 begin
 d:= 3 - 2 * dy;
 while (dx < dy) do
 begin
 FillLandCircleLines0(x, y, dx, dy);
-if (d < 0)
+if (d < 0) then
-then d:= d + 4 * dx + 6
+d:= d + 4 * dx + 6
-else begin
+else
+begin
 d:= d + 4 * (dx - dy) + 10;
 dec(dy)
 end;
 inc(dx)
 end;
-if (dx = dy) then FillLandCircleLines0(x, y, dx, dy);
+if (dx = dy) then
+FillLandCircleLines0(x, y, dx, dy);
 end;
 // FillRoundInLand after erasing land pixels to allow Land 0 check for mask.png to function
 FillRoundInLand(X, Y, Radius, 0);
 dy:= Radius;
 d:= 3 - 2 * Radius;
 while (dx < dy) do
 begin
 FillLandCircleLinesEBC(x, y, dx, dy);
-if (d < 0)
+if (d < 0) then
-then d:= d + 4 * dx + 6
+d:= d + 4 * dx + 6
-else begin
+else
+begin
 d:= d + 4 * (dx - dy) + 10;
 dec(dy)
 end;
 inc(dx)
 end;
-if (dx = dy) then FillLandCircleLinesEBC(x, y, dx, dy);
+if (dx = dy) then
+FillLandCircleLinesEBC(x, y, dx, dy);
 end;
 tx:= Max(X - Radius - 1, 0);
 dx:= Min(X + Radius + 1, LAND_WIDTH) - tx;
 ty:= Max(Y - Radius - 1, 0);
 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) <> 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;
 Land[ty, tx]:= Land[ty, tx] or lfDamaged;
 LandDirty[ty div 32, tx div 32]:= 1;
 end;
 inc(y, dY)
 begin
 X:= X + dX;
 Y:= Y + dY;
 tx:= hwRound(X);
 ty:= hwRound(Y);
-if ((ty and LAND_HEIGHT_MASK) = 0) and
+if ((ty and LAND_HEIGHT_MASK) = 0)
-((tx and LAND_WIDTH_MASK) = 0) and
+and ((tx and LAND_WIDTH_MASK) = 0)
-(((Land[ty, tx] and lfBasic) <> 0) or
+and (((Land[ty, tx] and lfBasic) <> 0) or ((Land[ty, tx] and lfObject) <> 0)) then
-((Land[ty, tx] and lfObject) <> 0)) then
 begin
 if despeckle then
 begin
 Land[ty, tx]:= Land[ty, tx] or lfDamaged;
 LandDirty[ty div 32, tx div 32]:= 1
 end;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
-else LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
+else
+LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
 for i:= -HalfWidth to HalfWidth do
 begin
 X:= nx - dX8;
 Y:= ny - dY8;
 for t:= 0 to 7 do
 begin
 X:= X + dX;
 Y:= Y + dY;
 tx:= hwRound(X);
 ty:= hwRound(Y);
-if ((ty and LAND_HEIGHT_MASK) = 0) and
+if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (((Land[ty, tx] and lfBasic) <> 0)
-((tx and LAND_WIDTH_MASK) = 0) and
+or ((Land[ty, tx] and lfObject) <> 0)) then
-(((Land[ty, tx] and lfBasic) <> 0) or
+begin
-((Land[ty, tx] and lfObject) <> 0)) then
+Land[ty, tx]:= Land[ty, tx] or lfDamaged;
-begin
+if despeckle then
-Land[ty, tx]:= Land[ty, tx] or lfDamaged;
+LandDirty[ty div 32, tx div 32]:= 1;
-if despeckle then LandDirty[ty div 32, tx div 32]:= 1;
+if (cReducedQuality and rqBlurryLand) = 0 then
-if (cReducedQuality and rqBlurryLand) = 0 then
+LandPixels[ty, tx]:= cExplosionBorderColor
-LandPixels[ty, tx]:= cExplosionBorderColor
+else
-else LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
+LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 X:= nx;
 Y:= ny;
 for t:= 0 to ticks do
 begin
 X:= X + dX;
 begin
 X:= X + dX;
 Y:= Y + dY;
 tx:= hwRound(X);
 ty:= hwRound(Y);
-if ((ty and LAND_HEIGHT_MASK) = 0) and
+if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (((Land[ty, tx] and lfBasic) <> 0)
-((tx and LAND_WIDTH_MASK) = 0) and
+or ((Land[ty, tx] and 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 despeckle then LandDirty[ty div 32, tx div 32]:= 1;
+if despeckle then
+LandDirty[ty div 32, tx div 32]:= 1;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
-else LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
+else
+LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
 for i:= 0 to 7 do
 begin
 X:= X + dX;
 Y:= Y + dY;
 tx:= hwRound(X);
 ty:= hwRound(Y);
-if ((ty and LAND_HEIGHT_MASK) = 0) and
+if ((ty and LAND_HEIGHT_MASK) = 0) and ((tx and LAND_WIDTH_MASK) = 0) and (((Land[ty, tx] and lfBasic) <> 0)
-((tx and LAND_WIDTH_MASK) = 0) and
+or ((Land[ty, tx] and 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 despeckle then LandDirty[ty div 32, tx div 32]:= 1;
+if despeckle then
+LandDirty[ty div 32, tx div 32]:= 1;
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[ty, tx]:= cExplosionBorderColor
-else LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
+else
+LandPixels[ty div 2, tx div 2]:= cExplosionBorderColor
 end
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
 h:= SpritesData[Obj].Height;
 row:= Frame mod numFramesFirstCol;
 col:= Frame div numFramesFirstCol;
 if SDL_MustLock(Image) then
 SDLTry(SDL_LockSurface(Image) >= 0, true);
 bpp:= Image^.format^.BytesPerPixel;
 TryDo(bpp = 4, 'It should be 32 bpp sprite', true);
 // Check that sprite fits free space
 p:= @(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]);
 case bpp of
 4: for y:= 0 to Pred(h) do
 begin
 for x:= 0 to Pred(w) do
 if (PLongword(@(p^[x * 4]))^) <> 0 then
-if ((cpY + y) <= Longint(topY)) or
+if ((cpY + y) <= Longint(topY)) or ((cpY + y) >= LAND_HEIGHT)
-((cpY + y) >= LAND_HEIGHT) or
+or ((cpX + x) <= Longint(leftX)) or ((cpX + x) >= Longint(rightX)) or (Land[cpY + y, cpX + x] <> 0) then
-((cpX + x) <= Longint(leftX)) or
+begin
-((cpX + x) >= Longint(rightX)) or
+if SDL_MustLock(Image) then
-(Land[cpY + y, cpX + x] <> 0) then
+SDL_UnlockSurface(Image);
-begin
+exit(false)
-if SDL_MustLock(Image) then
+end;
-SDL_UnlockSurface(Image);
+p:= @(p^[Image^.pitch]);
-exit(false)
+end;
 end;
-p:= @(p^[Image^.pitch]);
-end;
-end;
 TryPlaceOnLand:= true;
 if not doPlace then
 begin
 if SDL_MustLock(Image) then
 SDL_UnlockSurface(Image);
 exit
 end;
 // Checked, now place
 p:= @(PByteArray(Image^.pixels)^[ Image^.pitch * row * h + col * w * 4 ]);
 case bpp of
 4: for y:= 0 to Pred(h) do
 begin
 for x:= 0 to Pred(w) do
 if (PLongword(@(p^[x * 4]))^) <> 0 then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
 gX:= cpX + x;
 gY:= cpY + y;
 end
 else
 begin
 gX:= (cpX + x) div 2;
 gY:= (cpY + y) div 2;
 end;
 if indestructible then
 Land[cpY + y, cpX + x]:= lfIndestructible
 else if (LandPixels[gY, gX] and AMask) shr AShift = 255 then  // This test assumes lfBasic and lfObject differ only graphically
 Land[cpY + y, cpX + x]:= lfBasic
 else
 Land[cpY + y, cpX + x]:= lfObject;
 // For testing only. Intent is to flag this on objects with masks, or use it for an ice ray gun
-if (Theme = 'Snow') or (Theme = 'Christmas') then Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] or lfIce;
+if (Theme = 'Snow') or (Theme = 'Christmas') then
-LandPixels[gY, gX]:= PLongword(@(p^[x * 4]))^
+Land[cpY + y, cpX + x]:= Land[cpY + y, cpX + x] or lfIce;
-end;
+LandPixels[gY, gX]:= PLongword(@(p^[x * 4]))^
-p:= @(p^[Image^.pitch]);
+end;
-end;
+p:= @(p^[Image^.pitch]);
 end;
+end;
 if SDL_MustLock(Image) then
 SDL_UnlockSurface(Image);
 x:= Max(cpX, leftX);
 w:= Min(cpX + Image^.w, LAND_WIDTH) - x;
 y:= Max(cpY, topY);
 h:= Min(cpY + Image^.h, LAND_HEIGHT) - y;
 function Despeckle(X, Y: LongInt): boolean;
 var nx, ny, i, j, c, xx, yy: LongInt;
 pixelsweep: boolean;
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
 xx:= X;
 yy:= Y;
 end
 else
 begin
 xx:= X div 2;
 yy:= Y div 2;
 end;
 pixelsweep:= ((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
 if ((cReducedQuality and rqBlurryLand) <> 0) then
 begin
 nx:= nx div 2;
 ny:= ny div 2
 end;
-if LandPixels[ny, nx] <> 0 then inc(c);
+if LandPixels[ny, nx] <> 0 then
+inc(c);
 end
-else if Land[ny, nx] > 255 then inc(c);
+else if Land[ny, nx] > 255 then
+inc(c);
 end
 end;
 if c < 4 then // 0-3 neighbours
 begin
 LandPixels[yy, xx]:= LandBackPixel(X, Y)
 else
 LandPixels[yy, xx]:= 0;
 Land[Y, X]:= 0;
-if not pixelsweep then exit(true);
+if not pixelsweep then
+exit(true);
 end;
 end;
 Despeckle:= false
 end;
 procedure Smooth(X, Y: LongInt);
 begin
 // a bit of AA for explosions
 if (Land[Y, X] = 0) and (Y > LongInt(topY) + 1) and
 (Y < LAND_HEIGHT-2) and (X > LongInt(leftX) + 1) and (X < LongInt(rightX) - 1) then
 begin
-if ((((Land[y, x-1] and lfDamaged) <> 0) and (((Land[y+1,x] and lfDamaged) <> 0)) or ((Land[y-1,x] and lfDamaged) <> 0)) or
+if ((((Land[y, x-1] and lfDamaged) <> 0) and (((Land[y+1,x] and lfDamaged) <> 0)) or ((Land[y-1,x] and lfDamaged) <> 0))
-(((Land[y, x+1] and lfDamaged) <> 0) and (((Land[y-1,x] and lfDamaged) <> 0) or ((Land[y+1,x] and lfDamaged) <> 0)))) then
+or (((Land[y, x+1] and lfDamaged) <> 0) and (((Land[y-1,x] and lfDamaged) <> 0) or ((Land[y+1,x] and lfDamaged) <> 0)))) then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
-if ((LandPixels[y,x] and AMask) shr AShift) < 10 then LandPixels[y,x]:= (cExplosionBorderColor and (not AMask)) or (128 shl AShift)
+if ((LandPixels[y,x] and AMask) shr AShift) < 10 then
+LandPixels[y,x]:= (cExplosionBorderColor and (not AMask)) or (128 shl AShift)
 else
 LandPixels[y,x]:=
 (((((LandPixels[y,x] and RMask shr RShift) div 2)+((cExplosionBorderColor and RMask) shr RShift) div 2) and $FF) shl RShift) or
 (((((LandPixels[y,x] and GMask shr GShift) div 2)+((cExplosionBorderColor and GMask) shr GShift) div 2) and $FF) shl GShift) or
 (((((LandPixels[y,x] and BMask shr BShift) div 2)+((cExplosionBorderColor and BMask) shr BShift) div 2) and $FF) shl BShift) or ($FF shl AShift)
 end;
-if (Land[y, x-1] = lfObject) then Land[y,x]:= lfObject
+if (Land[y, x-1] = lfObject) then
-else if (Land[y, x+1] = lfObject) then Land[y,x]:= lfObject
+Land[y,x]:= lfObject
-else Land[y,x]:= lfBasic;
+else if (Land[y, x+1] = lfObject) then
+Land[y,x]:= lfObject
+else
+Land[y,x]:= lfBasic;
 end
-else if ((((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0)) or
+else if ((((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0))
-(((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0)) or
+or (((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0))
-(((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0)) or
+or (((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0))
-(((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0)) or
+or (((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0))
-(((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0)) or
+or (((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0))
-(((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0)) or
+or (((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0))
-(((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0)) or
+or (((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))
-(((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))) then
+or (((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))) then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
-if ((LandPixels[y,x] and AMask) shr AShift) < 10 then LandPixels[y,x]:= (cExplosionBorderColor and (not AMask)) or (64 shl AShift)
+if ((LandPixels[y,x] and AMask) shr AShift) < 10 then
+LandPixels[y,x]:= (cExplosionBorderColor and (not AMask)) or (64 shl AShift)
 else
 LandPixels[y,x]:=
 (((((LandPixels[y,x] and RMask shr RShift) * 3 div 4)+((cExplosionBorderColor and RMask) shr RShift) div 4) and $FF) shl RShift) or
 (((((LandPixels[y,x] and GMask shr GShift) * 3 div 4)+((cExplosionBorderColor and GMask) shr GShift) div 4) and $FF) shl GShift) or
 (((((LandPixels[y,x] and BMask shr BShift) * 3 div 4)+((cExplosionBorderColor and BMask) shr BShift) div 4) and $FF) shl BShift) or ($FF shl AShift)
 end;
-if (Land[y, x-1] = lfObject) then Land[y, x]:= lfObject
+if (Land[y, x-1] = lfObject) then
-else if (Land[y, x+1] = lfObject) then Land[y, x]:= lfObject
+Land[y, x]:= lfObject
-else if (Land[y+1, x] = lfObject) then Land[y, x]:= lfObject
+else if (Land[y, x+1] = lfObject) then
-else if (Land[y-1, x] = lfObject) then Land[y, x]:= lfObject
+Land[y, x]:= lfObject
+else if (Land[y+1, x] = lfObject) then
+Land[y, x]:= lfObject
+else if (Land[y-1, x] = lfObject) then
+Land[y, x]:= lfObject
 else Land[y,x]:= lfBasic
 end
 end
-else if ((cReducedQuality and rqBlurryLand) = 0) and (LandPixels[Y, X] and AMask = 255) and
+else if ((cReducedQuality and rqBlurryLand) = 0) and (LandPixels[Y, X] and AMask = 255)
-((Land[Y, X] and (lfDamaged or lfBasic) = lfBasic) or (Land[Y, X] and (lfDamaged or lfBasic) = lfBasic)) and
+and ((Land[Y, X] and (lfDamaged or lfBasic) = lfBasic) or (Land[Y, X] and (lfDamaged or lfBasic) = lfBasic))
-(Y > LongInt(topY) + 1) and (Y < LAND_HEIGHT-2) and (X > LongInt(leftX) + 1) and (X < LongInt(rightX) - 1) then
+and (Y > LongInt(topY) + 1) and (Y < LAND_HEIGHT-2) and (X > LongInt(leftX) + 1) and (X < LongInt(rightX) - 1) then
 begin
-if ((((Land[y, x-1] and lfDamaged) <> 0) and (((Land[y+1,x] and lfDamaged) <> 0)) or ((Land[y-1,x] and lfDamaged) <> 0)) or
+if ((((Land[y, x-1] and lfDamaged) <> 0) and (((Land[y+1,x] and lfDamaged) <> 0)) or ((Land[y-1,x] and lfDamaged) <> 0))
-(((Land[y, x+1] and lfDamaged) <> 0) and (((Land[y-1,x] and lfDamaged) <> 0) or ((Land[y+1,x] and lfDamaged) <> 0)))) then
+or (((Land[y, x+1] and lfDamaged) <> 0) and (((Land[y-1,x] and lfDamaged) <> 0) or ((Land[y+1,x] and lfDamaged) <> 0)))) then
 begin
 LandPixels[y,x]:=
 (((((LandPixels[y,x] and RMask shr RShift) div 2)+((cExplosionBorderColor and RMask) shr RShift) div 2) and $FF) shl RShift) or
 (((((LandPixels[y,x] and GMask shr GShift) div 2)+((cExplosionBorderColor and GMask) shr GShift) div 2) and $FF) shl GShift) or
 (((((LandPixels[y,x] and BMask shr BShift) div 2)+((cExplosionBorderColor and BMask) shr BShift) div 2) and $FF) shl BShift) or ($FF shl AShift)
 end
-else if ((((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0)) or
+else if ((((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0))
-(((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0)) or
+or (((Land[y, x-1] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0))
-(((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0)) or
+or (((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y+2,x] and lfDamaged) <> 0))
-(((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0)) or
+or (((Land[y, x+1] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y-2,x] and lfDamaged) <> 0))
-(((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0)) or
+or (((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0))
-(((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0)) or
+or (((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x+1] and lfDamaged) <> 0) and ((Land[y,x+2] and lfDamaged) <> 0))
-(((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0)) or
+or (((Land[y+1, x] and lfDamaged) <> 0) and ((Land[y+1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))
-(((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))) then
+or (((Land[y-1, x] and lfDamaged) <> 0) and ((Land[y-1,x-1] and lfDamaged) <> 0) and ((Land[y,x-2] and lfDamaged) <> 0))) then
 begin
 LandPixels[y,x]:=
 (((((LandPixels[y,x] and RMask shr RShift) * 3 div 4)+((cExplosionBorderColor and RMask) shr RShift) div 4) and $FF) shl RShift) or
 (((((LandPixels[y,x] and GMask shr GShift) * 3 div 4)+((cExplosionBorderColor and GMask) shr GShift) div 4) and $FF) shl GShift) or
 (((((LandPixels[y,x] and BMask shr BShift) * 3 div 4)+((cExplosionBorderColor and BMask) shr BShift) div 4) and $FF) shl BShift) or ($FF shl AShift)
 LandDirty[y, x+1]:= 1;
 recheck:= true;
 end
 end;
 end;
-if updateBlock then UpdateLandTexture(tx, 32, ty, 32);
+if updateBlock then
+UpdateLandTexture(tx, 32, ty, 32);
 LandDirty[y, x]:= 2;
 end;
 end;
 end;
 end;
 // Return true if outside of land or not the value tested, used right now for some X/Y movement that does not use normal hedgehog movement in GSHandlers.inc
 function CheckLandValue(X, Y: LongInt; LandFlag: Word): boolean; inline;
 begin
 CheckLandValue:= ((X and LAND_WIDTH_MASK <> 0) or (Y and LAND_HEIGHT_MASK <> 0)) or ((Land[Y, X] and LandFlag) = 0)
 end;
 function LandBackPixel(x, y: LongInt): LongWord; inline;
 var p: PLongWordArray;
 begin
-if LandBackSurface = nil then LandBackPixel:= 0
+if LandBackSurface = nil then
+LandBackPixel:= 0
 else
 begin
 p:= LandBackSurface^.pixels;
 LandBackPixel:= p^[LandBackSurface^.w * (y mod LandBackSurface^.h) + (x mod LandBackSurface^.w)];// or $FF000000;
 end
 end;
 procedure DrawLine(X1, Y1, X2, Y2: LongInt; Color: Longword);
 var
 eX:= 0;
 eY:= 0;
 dX:= X2 - X1;
 dY:= Y2 - Y1;
-if (dX > 0) then sX:= 1
+if (dX > 0) then
+sX:= 1
 else
 if (dX < 0) then
 begin
 sX:= -1;
 dX:= -dX
-end else sX:= dX;
+end
+else
-if (dY > 0) then sY:= 1
+sX:= dX;
-else
-if (dY < 0) then
+if (dY > 0) then
-begin
+sY:= 1
-sY:= -1;
+else
-dY:= -dY
+if (dY < 0) then
-end else sY:= dY;
+begin
+sY:= -1;
-if (dX > dY) then d:= dX
+dY:= -dY
-else d:= dY;
+end
+else
+sY:= dY;
+if (dX > dY) then
+d:= dX
+else
+d:= dY;
 x:= X1;
 y:= Y1;
 for i:= 0 to d do
 begin
 inc(eX, dX);
 inc(eY, dY);
 if (eX > d) then
 begin
 dec(eX, d);
 inc(x, sX);
 end;
 if (eY > d) then
 begin
 dec(eY, d);
 inc(y, sY);
 end;
 if ((x and LAND_WIDTH_MASK) = 0) and ((y and LAND_HEIGHT_MASK) = 0) then
 Land[y, x]:= Color;
 end
 end;
 end.

changeset 6580	6155187bf599
parent 6490	531bf083e8db
child 6681	f46b1a1de2ce