hedgewars: comparison hedgewars/uLandGraphics.pas

equal deleted inserted replaced

-:88b0cf9d6de5
+:55a1edd97911
 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, 4095) do
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
 if Land[y + dy, i] <> COLOR_INDESTRUCTIBLE 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, 4095) do
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
 if Land[y - dy, i] <> COLOR_INDESTRUCTIBLE 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, 4095) do
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do
 if Land[y + dx, i] <> COLOR_INDESTRUCTIBLE 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, 4095) do
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do
 if Land[y - dx, i] <> COLOR_INDESTRUCTIBLE 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, 4095) do
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
 if (Land[y + dy, i] > 0) 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, 4095) do
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
 if (Land[y - dy, i] > 0) 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, 4095) do
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do
 if (Land[y + dx, i] > 0) 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, 4095) do
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do
 if (Land[y - dx, i] > 0) 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, 4095) do inc(Land[y + dy, i]);
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do inc(Land[y + dy, i]);
 if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, 4095) do inc(Land[y - dy, i]);
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do inc(Land[y - dy, i]);
 if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dy, 0) to min(x + dy, 4095) do inc(Land[y + dx, i]);
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do inc(Land[y + dx, i]);
 if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dy, 0) to min(x + dy, 4095) do inc(Land[y - dx, i]);
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do inc(Land[y - dx, i]);
 end
 end;
 procedure FillRoundInLand(X, Y, Radius: LongInt; Value: Longword);
 var dx, dy, d: LongInt;
 procedure FillLandCircleLines0(x, y, dx, dy: LongInt);
 var i: LongInt;
 begin
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, 4095) do
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
 if Land[y + dy, i] <> COLOR_INDESTRUCTIBLE then
 LandPixels[y + dy, i]:= 0;
 if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, 4095) do
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
 if Land[y - dy, i] <> COLOR_INDESTRUCTIBLE then
 LandPixels[y - dy, i]:= 0;
 if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dy, 0) to min(x + dy, 4095) do
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do
 if Land[y + dx, i] <> COLOR_INDESTRUCTIBLE then
 LandPixels[y + dx, i]:= 0;
 if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dy, 0) to min(x + dy, 4095) do
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do
 if Land[y - dx, i] <> COLOR_INDESTRUCTIBLE then
 LandPixels[y - dx, i]:= 0;
 end;
 procedure FillLandCircleLinesEBC(x, y, dx, dy: LongInt);
 var i: LongInt;
 begin
 if ((y + dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, 4095) do
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
 if Land[y + dy, i] = COLOR_LAND then
 begin
 LandPixels[y + dy, i]:= cExplosionBorderColor;
 //          Despeckle(y + dy, i);
 LandDirty[(y + dy) div 32, i div 32]:= 1;
 end;
 if ((y - dy) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dx, 0) to min(x + dx, 4095) do
+for i:= max(x - dx, 0) to min(x + dx, LAND_WIDTH - 1) do
 if Land[y - dy, i] = COLOR_LAND then
 begin
 LandPixels[y - dy, i]:= cExplosionBorderColor;
 //          Despeckle(y - dy, i);
 LandDirty[(y - dy) div 32, i div 32]:= 1;
 end;
 if ((y + dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dy, 0) to min(x + dy, 4095) do
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do
 if Land[y + dx, i] = COLOR_LAND then
 begin
 LandPixels[y + dx, i]:= cExplosionBorderColor;
 //           Despeckle(y + dx, i);
 LandDirty[(y + dx) div 32, i div 32]:= 1;
 end;
 if ((y - dx) and LAND_HEIGHT_MASK) = 0 then
-for i:= max(x - dy, 0) to min(x + dy, 4095) do
+for i:= max(x - dy, 0) to min(x + dy, LAND_WIDTH - 1) do
 if Land[y - dx, i] = COLOR_LAND then
 begin
 LandPixels[y - dx, i]:= cExplosionBorderColor;
 //          Despeckle(y - dx, i);
 LandDirty[(y - dx) div 32, i div 32]:= 1;
 inc(dx)
 end;
 if (dx = dy) then FillLandCircleLinesEBC(x, y, dx, dy);
 d:= max(Y - Radius - 1, 0);
-dy:= min(Y + Radius + 1, 2047) - d;
+dy:= min(Y + Radius + 1, LAND_HEIGHT) - d;
 UpdateLandTexture(d, dy)
 end;
 procedure DrawHLinesExplosions(ar: PRangeArray; Radius: LongInt; y, dY: LongInt; Count: Byte);
 var tx, ty, i: LongInt;
 			until not updatedCell;
 		LandDirty[y, x]:= 0;
 		end;
 	if updatedRow then
-		if y = 63 then
+		UpdateLandTexture(y * 32, 32);
-			UpdateLandTexture(LAND_HEIGHT-31, 31)
-		else
-			UpdateLandTexture(y*32, 32);
 	end;
 end;
 end.

changeset 1760	55a1edd97911
parent 1753	2ccba26f1aa4
child 1761	c7038eade58d