sheepy-clone: comparison hedgewars/uLandGraphics.pas

equal deleted inserted replaced

-:94e1fa117081
+:76e3a3fc17cd
 procedure FillCircleLines(x, y, dx, dy: LongInt; Value: Longword);
 var i: LongInt;
 begin
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) 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:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) 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:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) 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:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) 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, isCurrent: boolean);
 var i: LongInt;
 begin
 if not doSet then
 begin
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) do
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if isCurrent then
 Land[y + dy, i]:= Land[y + dy, i] and $FF7F
 else if Land[y + dy, i] and $007F > 0 then
 Land[y + dy, i]:= (Land[y + dy, i] and $FF80) or ((Land[y + dy, i] and $7F) - 1);
 if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) do
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if isCurrent then
 Land[y - dy, i]:= Land[y - dy, i] and $FF7F
 else if Land[y - dy, i] and $007F > 0 then
 Land[y - dy, i]:= (Land[y - dy, i] and $FF80) or ((Land[y - dy, i] and $7F) - 1);
 if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) do
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if isCurrent then
 Land[y + dx, i]:= Land[y + dx, i] and $FF7F
 else if Land[y + dx, i] and $007F > 0 then
 Land[y + dx, i]:= (Land[y + dx, i] and $FF80) or ((Land[y + dx, i] and $7F) - 1);
 if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) do
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if isCurrent then
 Land[y - dx, i]:= Land[y - dx, i] and $FF7F
 else if Land[y - dx, i] and $007F > 0 then
 Land[y - dx, i]:= (Land[y - dx, i] and $FF80) or ((Land[y - dx, i] and $7F) - 1)
 end
 else
 begin
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) do
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if isCurrent then
 Land[y + dy, i]:= Land[y + dy, i] or $80
 else if Land[y + dy, i] and $007F < 127 then
 Land[y + dy, i]:= (Land[y + dy, i] and $FF80) or ((Land[y + dy, i] and $7F) + 1);
 if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) do
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if isCurrent then
 Land[y - dy, i]:= Land[y - dy, i] or $80
 else if Land[y - dy, i] and $007F < 127 then
 Land[y - dy, i]:= (Land[y - dy, i] and $FF80) or ((Land[y - dy, i] and $7F) + 1);
 if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) do
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if isCurrent then
 Land[y + dx, i]:= Land[y + dx, i] or $80
 else if Land[y + dx, i] and $007F < 127 then
 Land[y + dx, i]:= (Land[y + dx, i] and $FF80) or ((Land[y + dx, i] and $7F) + 1);
 if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) do
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if isCurrent then
 Land[y - dx, i]:= Land[y - dx, i] or $80
 else if Land[y - dx, i] and $007F < 127 then
 Land[y - dx, i]:= (Land[y - dx, i] and $FF80) or ((Land[y - dx, i] and $7F) + 1)
 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:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) do
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255))  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:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) do
+for i:= Max(x - dx, 0) to Min(x + dx, LAND_WIDTH - 1) do
 if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255))  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:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) do
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255))  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:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) do
+for i:= Max(x - dy, 0) to Min(x + dy, LAND_WIDTH - 1) do
 if ((Land[t, i] and lfIndestructible) = 0) and (not disableLandBack or (Land[t, i] > 255))  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:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) do
+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;
 LandPixels[by, bx]:= 0
 end;
 t:= y - dy;
 if (t and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) do
+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;
 LandPixels[by, bx]:= 0
 end;
 t:= y + dx;
 if (t and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) do
+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;
 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:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) do
+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;
 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:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) 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]:= ExplosionBorderColor
 else
 LandDirty[t div 32, i div 32]:= 1;
 end;
 t:= y - dy;
 if (t and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dx, LAND_WIDTH - 1) downto Max(x - dx, 0) 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]:= ExplosionBorderColor
 else
 LandDirty[t div 32, i div 32]:= 1;
 end;
 t:= y + dx;
 if (t and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) 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]:= ExplosionBorderColor
 else
 LandDirty[t div 32, i div 32]:= 1;
 end;
 t:= y - dx;
 if (t and LAND_HEIGHT_MASK) = 0 then
-for i:= Min(x + dy, LAND_WIDTH - 1) downto Max(x - dy, 0) 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]:= ExplosionBorderColor
 else
 procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte);
 var tx, ty, by, bx,  i: LongInt;
 begin
 for i:= 0 to Pred(Count) do
 begin
-for ty:= Min(y + Radius, LAND_HEIGHT) downto Max(y - Radius, 0) do
+for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do
-for tx:= Min(LAND_WIDTH, ar^[i].Right + Radius) downto Max(0, ar^[i].Left - Radius) do
+for tx:= Max(0, ar^[i].Left - Radius) to Min(LAND_WIDTH, ar^[i].Right + Radius) do
 begin
 if (Land[ty, tx] and lfIndestructible) = 0 then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
 inc(Radius, 4);
 dec(y, Count * dY);
 for i:= 0 to Pred(Count) do
 begin
-for ty:= Min(y + Radius, LAND_HEIGHT) downto Max(y - Radius, 0) do
+for ty:= Max(y - Radius, 0) to Min(y + Radius, LAND_HEIGHT) do
-for tx:= Min(LAND_WIDTH, ar^[i].Right + Radius) downto Max(0, ar^[i].Left - 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]:= ExplosionBorderColor
 else

changeset 7509	76e3a3fc17cd
parent 7492	3188794b9d87
child 8026	4a4f21070479
child 8579	d18bc19d780a