hedgewars: comparison hedgewars/uLandGraphics.pas

equal deleted inserted replaced

-:fe0e3903bb9e
+:bcefeeabaa33
 function  LandBackPixel(x, y: LongInt): LongWord;
 function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace: boolean): boolean;
 implementation
-uses SDLh, uMisc, uLandTexture, uVariables;
+uses SDLh, uMisc, uLandTexture, uVariables, uUtils;
 procedure FillCircleLines(x, y, dx, dy: LongInt; Value: Longword);
 var i: LongInt;
 begin
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
+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
+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
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if (Land[y + dx, i] and lfIndestructible) = 0 then
 Land[y + dx, 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
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if (Land[y - dx, i] and lfIndestructible) = 0 then
 Land[y - dx, i]:= Value;
 end;
 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
+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 ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
+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]);
 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 dec(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
+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 dec(Land[y - dx, i]);
 end else
 begin
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if (Land[y + dy, i] < 256) then
 inc(Land[y + dy, i]);
 if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if (Land[y - dy, i] < 256) then
 inc(Land[y - dy, i]);
 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] < 256) then
 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
+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 FillLandCircleLines0(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
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if (not isMap and ((Land[t, i] and lfIndestructible) = 0)) or ((Land[t, i] and lfBasic) <> 0) then
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= 0
 else
 LandPixels[t div 2, i div 2]:= 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
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if (not isMap and ((Land[t, i] and lfIndestructible) = 0)) or ((Land[t, i] and lfBasic) <> 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
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if (not isMap and ((Land[t, i] and lfIndestructible) = 0)) or ((Land[t, i] and lfBasic) <> 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
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if (not isMap and ((Land[t, i] and lfIndestructible) = 0)) or ((Land[t, i] and lfBasic) <> 0) then
 if (cReducedQuality and rqBlurryLand) = 0 then
 LandPixels[t, i]:= 0
 else
 LandPixels[t div 2, i div 2]:= 0;
 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
+for i:= Max(x - dx, 0) to Min(x + dx, 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]:= 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
+for i:= Max(x - dx, 0) to Min(x + dx, 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]:= 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
+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]:= 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
+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)
 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
+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
 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
+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
 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
+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
 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
+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
 inc(dx)
 end;
 if (dx = dy) then FillLandCircleLinesEBC(x, y, dx, dy);
 end;
-tx:= max(X - Radius - 1, 0);
+tx:= Max(X - Radius - 1, 0);
-dx:= min(X + Radius + 1, LAND_WIDTH) - tx;
+dx:= Min(X + Radius + 1, LAND_WIDTH) - tx;
-ty:= max(Y - Radius - 1, 0);
+ty:= Max(Y - Radius - 1, 0);
-dy:= min(Y + Radius + 1, LAND_HEIGHT) - ty;
+dy:= Min(Y + Radius + 1, LAND_HEIGHT) - ty;
 UpdateLandTexture(tx, dx, ty, dy);
 DrawExplosion:= cnt
 end;
 procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte);
 var tx, ty, i: LongInt;
 begin
 for i:= 0 to Pred(Count) do
 begin
-for ty:= max(y - Radius, 0) to min(y + Radius, LAND_HEIGHT) do
+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
+for tx:= Max(0, ar^[i].Left - Radius) to Min(LAND_WIDTH, ar^[i].Right + Radius) 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)
 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 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
+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
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
-tx:= max(stX - HalfWidth * 2 - 4 - abs(hwRound(dX * ticks)), 0);
+tx:= Max(stX - HalfWidth * 2 - 4 - abs(hwRound(dX * ticks)), 0);
-ty:= max(stY - HalfWidth * 2 - 4 - abs(hwRound(dY * ticks)), 0);
+ty:= Max(stY - HalfWidth * 2 - 4 - abs(hwRound(dY * ticks)), 0);
-ddx:= min(stX + HalfWidth * 2 + 4 + abs(hwRound(dX * ticks)), LAND_WIDTH) - tx;
+ddx:= Min(stX + HalfWidth * 2 + 4 + abs(hwRound(dX * ticks)), LAND_WIDTH) - tx;
-ddy:= min(stY + HalfWidth * 2 + 4 + abs(hwRound(dY * ticks)), LAND_HEIGHT) - ty;
+ddy:= Min(stY + HalfWidth * 2 + 4 + abs(hwRound(dY * ticks)), LAND_HEIGHT) - ty;
 UpdateLandTexture(tx, ddx, ty, ddy)
 end;
 function TryPlaceOnLand(cpX, cpY: LongInt; Obj: TSprite; Frame: LongInt; doPlace: boolean): boolean;
 end;
 end;
 if SDL_MustLock(Image) then
 SDL_UnlockSurface(Image);
-x:= max(cpX, leftX);
+x:= Max(cpX, leftX);
-w:= min(cpX + Image^.w, LAND_WIDTH) - x;
+w:= Min(cpX + Image^.w, LAND_WIDTH) - x;
-y:= max(cpY, topY);
+y:= Max(cpY, topY);
-h:= min(cpY + Image^.h, LAND_HEIGHT) - y;
+h:= Min(cpY + Image^.h, LAND_HEIGHT) - y;
 UpdateLandTexture(x, w, y, h)
 end;
 // was experimenting with applying as damage occurred.
 function Despeckle(X, Y: LongInt): boolean;

changeset 4374	bcefeeabaa33
parent 4367	f4a0ec067601
child 4377	43945842da0c