sheepy-clone: comparison hedgewars/uLandGraphics.pas

equal deleted inserted replaced

-:803b277e4894
+:3f21a9dc93d0
 procedure DrawExplosion(X, Y, Radius: LongInt);
 var dx, dy, ty, tx, d: LongInt;
 begin
 // draw background land texture
-	begin
+begin
-	dx:= 0;
+dx:= 0;
-	dy:= Radius;
+dy:= Radius;
-	d:= 3 - 2 * Radius;
+d:= 3 - 2 * Radius;
-	while (dx < dy) do
+while (dx < dy) do
-		begin
+begin
-		FillLandCircleLinesBG(x, y, dx, dy);
+FillLandCircleLinesBG(x, y, dx, dy);
-		if (d < 0)
+if (d < 0)
-		then d:= d + 4 * dx + 6
+then d:= d + 4 * dx + 6
-		else begin
+else begin
-			d:= d + 4 * (dx - dy) + 10;
+d:= d + 4 * (dx - dy) + 10;
-			dec(dy)
+dec(dy)
-			end;
+end;
-		inc(dx)
+inc(dx)
-		end;
+end;
-	if (dx = dy) then FillLandCircleLinesBG(x, y, dx, dy);
+if (dx = dy) then FillLandCircleLinesBG(x, y, dx, dy);
-	end;
+end;
 // draw a hole in land
 if Radius > 20 then
-	begin
+begin
-	dx:= 0;
+dx:= 0;
-	dy:= Radius - 15;
+dy:= Radius - 15;
-	d:= 3 - 2 * dy;
+d:= 3 - 2 * dy;
-	while (dx < dy) do
+while (dx < dy) do
-		begin
+begin
-		FillLandCircleLines0(x, y, dx, dy);
+FillLandCircleLines0(x, y, dx, dy);
-		if (d < 0)
+if (d < 0)
-		then d:= d + 4 * dx + 6
+then d:= d + 4 * dx + 6
-		else begin
+else begin
-			d:= d + 4 * (dx - dy) + 10;
+d:= d + 4 * (dx - dy) + 10;
-			dec(dy)
+dec(dy)
-			end;
+end;
-		inc(dx)
+inc(dx)
-		end;
+end;
-	if (dx = dy) then FillLandCircleLines0(x, y, dx, dy);
+if (dx = dy) then FillLandCircleLines0(x, y, dx, dy);
-	end;
+end;
 // FillRoundInLand after erasing land pixels to allow Land 0 check for mask.png to function
-	FillRoundInLand(X, Y, Radius, 0);
+FillRoundInLand(X, Y, Radius, 0);
 // draw explosion border
-	begin
+begin
-	inc(Radius, 4);
+inc(Radius, 4);
-	dx:= 0;
+dx:= 0;
-	dy:= Radius;
+dy:= Radius;
-	d:= 3 - 2 * Radius;
+d:= 3 - 2 * Radius;
-	while (dx < dy) do
+while (dx < dy) do
-		begin
+begin
-		FillLandCircleLinesEBC(x, y, dx, dy);
+FillLandCircleLinesEBC(x, y, dx, dy);
-		if (d < 0)
+if (d < 0)
-		then d:= d + 4 * dx + 6
+then d:= d + 4 * dx + 6
-		else begin
+else begin
-			d:= d + 4 * (dx - dy) + 10;
+d:= d + 4 * (dx - dy) + 10;
-			dec(dy)
+dec(dy)
-			end;
+end;
-		inc(dx)
+inc(dx)
-		end;
+end;
-	if (dx = dy) then FillLandCircleLinesEBC(x, y, dx, dy);
+if (dx = dy) then FillLandCircleLinesEBC(x, y, dx, dy);
-	end;
+end;
 tx:= max(X - Radius - 1, 0);
 dx:= min(X + Radius + 1, LAND_WIDTH) - tx;
 ty:= max(Y - Radius - 1, 0);
 dy:= min(Y + Radius + 1, LAND_HEIGHT) - ty;
 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
+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] = COLOR_LAND then
+if Land[ty, tx] = COLOR_LAND then
-				LandPixels[ty, tx]:= LandBackPixel(tx, ty)
+LandPixels[ty, tx]:= LandBackPixel(tx, ty)
-			else if Land[ty, tx] = COLOR_OBJECT then
+else if Land[ty, tx] = COLOR_OBJECT then
-				LandPixels[ty, tx]:= 0;
+LandPixels[ty, tx]:= 0;
-	inc(y, dY)
+inc(y, dY)
-	end;
+end;
 inc(Radius, 4);
 dec(y, Count * dY);
 for i:= 0 to Pred(Count) do
 begin
 X:= nx - dX8;
 Y:= ny - dY8;
 for t:= -8 to ticks + 8 do
 begin
-	X:= X + dX;
+X:= X + dX;
-	Y:= Y + dY;
+Y:= Y + dY;
-	tx:= hwRound(X);
+tx:= hwRound(X);
-	ty:= hwRound(Y);
+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
+((tx and LAND_WIDTH_MASK) = 0) and
-	   ((Land[ty, tx] = COLOR_LAND) or
+((Land[ty, tx] = COLOR_LAND) or
-	   (Land[ty, tx] = COLOR_OBJECT)) then
+(Land[ty, tx] = COLOR_OBJECT)) then
-		LandPixels[ty, tx]:= cExplosionBorderColor
+LandPixels[ty, tx]:= cExplosionBorderColor
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
 begin
 X:= nx - dX8;
 Y:= ny - dY8;
 for t:= 0 to 7 do
 begin
-	X:= X + dX;
+X:= X + dX;
-	Y:= Y + dY;
+Y:= Y + dY;
-	tx:= hwRound(X);
+tx:= hwRound(X);
-	ty:= hwRound(Y);
+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
+((tx and LAND_WIDTH_MASK) = 0) and
-	   ((Land[ty, tx] = COLOR_LAND) or
+((Land[ty, tx] = COLOR_LAND) or
-	   (Land[ty, tx] = COLOR_OBJECT)) then
+(Land[ty, tx] = COLOR_OBJECT)) then
-		LandPixels[ty, tx]:= cExplosionBorderColor
+LandPixels[ty, tx]:= cExplosionBorderColor
 end;
 X:= nx;
 Y:= ny;
 for t:= 0 to ticks do
 begin
 Land[ty, tx]:= 0;
 end
 end;
 for t:= 0 to 7 do
 begin
-	X:= X + dX;
+X:= X + dX;
-	Y:= Y + dY;
+Y:= Y + dY;
-	tx:= hwRound(X);
+tx:= hwRound(X);
-	ty:= hwRound(Y);
+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
+((tx and LAND_WIDTH_MASK) = 0) and
-	   ((Land[ty, tx] = COLOR_LAND) or
+((Land[ty, tx] = COLOR_LAND) or
-	   (Land[ty, tx] = COLOR_OBJECT)) then
+(Land[ty, tx] = COLOR_OBJECT)) then
-		LandPixels[ty, tx]:= cExplosionBorderColor
+LandPixels[ty, tx]:= cExplosionBorderColor
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
 begin
 X:= nx - dX8;
 Y:= ny - dY8;
 for t:= -8 to ticks + 8 do
 begin
-	X:= X + dX;
+X:= X + dX;
-	Y:= Y + dY;
+Y:= Y + dY;
-	tx:= hwRound(X);
+tx:= hwRound(X);
-	ty:= hwRound(Y);
+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
+((tx and LAND_WIDTH_MASK) = 0) and
-	   ((Land[ty, tx] = COLOR_LAND) or
+((Land[ty, tx] = COLOR_LAND) or
-	   (Land[ty, tx] = COLOR_OBJECT)) then
+(Land[ty, tx] = COLOR_OBJECT)) then
-		LandPixels[ty, tx]:= cExplosionBorderColor
+LandPixels[ty, tx]:= cExplosionBorderColor
 end;
 nx:= nx - dY;
 ny:= ny + dX;
 end;
 // was experimenting with applying as damage occurred.
 function Despeckle(X, Y: LongInt): boolean;
 var nx, ny, i, j, c: LongInt;
 begin
 if (Land[Y, X] <> 0) and (Land[Y, X] <> COLOR_INDESTRUCTIBLE) and (LandPixels[Y, X] = cExplosionBorderColor)then // check neighbours
-	begin
+begin
-	c:= 0;
+c:= 0;
-	for i:= -1 to 1 do
+for i:= -1 to 1 do
-		for j:= -1 to 1 do
+for j:= -1 to 1 do
-			if (i <> 0) or (j <> 0) then
+if (i <> 0) or (j <> 0) then
-				begin
+begin
-				ny:= Y + i;
+ny:= Y + i;
-				nx:= X + j;
+nx:= X + j;
-				if ((ny and LAND_HEIGHT_MASK) = 0) and ((nx and LAND_WIDTH_MASK) = 0) then
+if ((ny and LAND_HEIGHT_MASK) = 0) and ((nx and LAND_WIDTH_MASK) = 0) then
-					if Land[ny, nx] > 255 then
+if Land[ny, nx] > 255 then
-						inc(c);
+inc(c);
-				end;
+end;
-	if c < 4 then // 0-3 neighbours
+if c < 4 then // 0-3 neighbours
-		begin
+begin
 if Land[Y, X] = COLOR_LAND then LandPixels[Y, X]:= LandBackPixel(X, Y) else LandPixels[Y, X]:= 0;
-		Land[Y, X]:= 0;
+Land[Y, X]:= 0;
-		exit(true);
+exit(true);
-		end;
+end;
-	end;
+end;
 Despeckle:= false
 end;
 function SweepDirty: boolean;
 var x, y, xx, yy: LongInt;
 bRes, updateBlock, resweep: boolean;
 begin
 bRes:= false;
 for y:= 0 to LAND_HEIGHT div 32 - 1 do
-	begin
+begin
-	for x:= 0 to LAND_WIDTH div 32 - 1 do
+for x:= 0 to LAND_WIDTH div 32 - 1 do
-		begin
+begin
-		if LandDirty[y, x] <> 0 then
+if LandDirty[y, x] <> 0 then
-			begin
+begin
-			updateBlock:= false;
+updateBlock:= false;
 resweep:= true;
 while(resweep) do
 begin
 resweep:= false;
 for yy:= y * 32 to y * 32 + 31 do
 bRes:= true;
 updateBlock:= true;
 resweep:= true;
 end;
 end;
-			if updateBlock then UpdateLandTexture(x * 32, 32, y * 32, 32);
+if updateBlock then UpdateLandTexture(x * 32, 32, y * 32, 32);
-			LandDirty[y, x]:= 0;
+LandDirty[y, x]:= 0;
-			end;
+end;
-		end;
+end;
-	end;
+end;
 SweepDirty:= bRes;
 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

changeset 2948	3f21a9dc93d0
parent 2741	7a84ce33f52f
child 2981	d0471586a616