sheepy-clone: comparison hedgewars/uLand.pas

equal deleted inserted replaced

-:88b0cf9d6de5
+:55a1edd97911
 unit uLand;
 interface
 uses SDLh, uLandTemplates, uFloat, GL, uConsts;
 {$include options.inc}
-type TLandArray = packed array[0..LAND_HEIGHT, 0..LAND_WIDTH] of LongWord;
+type TLandArray = packed array[0 .. LAND_HEIGHT - 1, 0 .. LAND_WIDTH - 1] of LongWord;
-TPreview = packed array[0..127, 0..31] of byte;
+	TPreview  = packed array[0..127, 0..31] of byte;
-TDirtyTag = packed array[0..63, 0..127] of byte;
+	TDirtyTag = packed array[0 .. LAND_HEIGHT div 32 - 1, 0 .. LAND_WIDTH div 32 - 1] of byte;
 var  Land: TLandArray;
 LandPixels: TLandArray;
 LandTexture: PTexture = nil;
 LandDirty: TDirtyTag;
 procedure Push(_xl, _xr, _y, _dir: LongInt);
 begin
 TryDo(Stack.Count <= 8192, 'FillLand: stack overflow', true);
 _y:= _y + _dir;
-if (_y < 0) or (_y > LAND_HEIGHT) then exit;
+if (_y < 0) or (_y >= LAND_HEIGHT) then exit;
 with Stack.points[Stack.Count] do
 begin
 xl:= _xl;
 xr:= _xr;
 y:= _y;
 Push(xl, xr, y,  1);
 while Stack.Count > 0 do
 begin
 Pop(xl, xr, y, dir);
 while (xl > 0) and (Land[y, xl] <> 0) do dec(xl);
-while (xr < LAND_WIDTH) and (Land[y, xr] <> 0) do inc(xr);
+while (xr < LAND_WIDTH - 1) and (Land[y, xr] <> 0) do inc(xr);
 while (xl < xr) do
 begin
 while (xl <= xr) and (Land[y, xl] = 0) do inc(xl);
 x:= xl;
 while (xl <= xr) and (Land[y, xl] <> 0) do
 r, rr: TSDL_Rect;
 x, yd, yu: LongInt;
 begin
 tmpsurf:= LoadImage(Pathz[ptCurrTheme] + '/LandTex', false, true, false);
 r.y:= 0;
-while r.y < 2048 do
+while r.y < LAND_HEIGHT do
 	begin
 	r.x:= 0;
-	while r.x <= LAND_WIDTH do
+	while r.x < LAND_WIDTH do
 		begin
 		SDL_UpperBlit(tmpsurf, nil, Surface, @r);
 		inc(r.x, tmpsurf^.w)
 		end;
 	inc(r.y, tmpsurf^.h)
 	end;
 SDL_FreeSurface(tmpsurf);
 tmpsurf:= LoadImage(Pathz[ptCurrTheme] + '/Border', false, true, true);
-for x:= 0 to 4095 do
+for x:= 0 to LAND_WIDTH - 1 do
 	begin
-	yd:= LAND_HEIGHT;
+	yd:= LAND_HEIGHT - 1;
 	repeat
-		while (yd > 0   ) and (Land[yd, x] =  0) do dec(yd);
+		while (yd > 0) and (Land[yd, x] =  0) do dec(yd);
 		if (yd < 0) then yd:= 0;
-		while (yd <= LAND_HEIGHT) and (Land[yd, x] <> 0) do inc(yd);
+		while (yd < LAND_HEIGHT) and (Land[yd, x] <> 0) do inc(yd);
 		dec(yd);
 		yu:= yd;
 		while (yu > 0  ) and (Land[yu, x] <> 0) do dec(yu);
 		while (yu < yd ) and (Land[yu, x] =  0) do inc(yu);
-		if (yd < LAND_HEIGHT) and ((yd - yu) >= 16) then
+		if (yd < LAND_HEIGHT - 1) and ((yd - yu) >= 16) then
 			begin
 			rr.x:= x;
 			rr.y:= yd - 15;
 			r.x:= x mod tmpsurf^.w;
 			r.y:= 16;
 if canMirror then
 if getrandom(2) = 0 then
 begin
 for i:= 0 to pred(BasePointsCount) do
 if pa.ar[i].x <> NTPX then
-pa.ar[i].x:= LAND_WIDTH - pa.ar[i].x;
+pa.ar[i].x:= LAND_WIDTH - 1 - pa.ar[i].x;
 for i:= 0 to pred(FillPointsCount) do
-FillPoints^[i].x:= LAND_WIDTH - FillPoints^[i].x;
+FillPoints^[i].x:= LAND_WIDTH - 1 - FillPoints^[i].x;
 end;
 if canFlip then
 if getrandom(2) = 0 then
 begin
 for i:= 0 to pred(BasePointsCount) do
-pa.ar[i].y:= LAND_HEIGHT - pa.ar[i].y;
+pa.ar[i].y:= LAND_HEIGHT - 1 - pa.ar[i].y;
 for i:= 0 to pred(FillPointsCount) do
-FillPoints^[i].y:= LAND_HEIGHT - FillPoints^[i].y;
+FillPoints^[i].y:= LAND_HEIGHT - 1 - FillPoints^[i].y;
 end;
 end
 end;
 function CheckIntersect(V1, V2, V3, V4: TPoint): boolean;
 radz[0]:= 0;
 for i:= 0 to Pred(pa.Count) do
 with pa.ar[i] do
 if x <> NTPX then
 begin
-radz[i]:= Min(Max(x - cEdge, 0), Max(LAND_WIDTH + 1 - cEdge - x, 0));
+radz[i]:= Min(Max(x - cEdge, 0), Max(LAND_WIDTH - cEdge - x, 0));
-radz[i]:= Min(radz[i], Min(Max(y - cEdge, 0), Max(LAND_HEIGHT + 1 - cEdge - y, 0)));
+radz[i]:= Min(radz[i], Min(Max(y - cEdge, 0), Max(LAND_HEIGHT - cEdge - y, 0)));
 if radz[i] > 0 then
 for k:= 0 to Pred(i) do
 begin
 dist:= Max(abs(x - pa.ar[k].x), abs(y - pa.ar[k].y));
 radz[k]:= Max(0, Min((dist - cMinDist) div 2, radz[k]));
 procedure GenBlank(var Template: TEdgeTemplate);
 var pa: TPixAr;
 i: Longword;
 y, x: Longword;
 begin
-for y:= 0 to LAND_HEIGHT do
+for y:= 0 to LAND_HEIGHT - 1 do
-for x:= 0 to LAND_WIDTH do
+for x:= 0 to LAND_WIDTH - 1 do
 Land[y, x]:= COLOR_LAND;
 SetPoints(Template, pa);
 for i:= 1 to Template.BezierizeCount do
 begin
 if SDL_MustLock(Surface) then
 	SDLTry(SDL_LockSurface(Surface) >= 0, true);
 p:= Surface^.pixels;
-for y:= 0 to LAND_HEIGHT do
+for y:= 0 to LAND_HEIGHT - 1 do
 	begin
-	for x:= 0 to LAND_WIDTH do
+	for x:= 0 to LAND_WIDTH - 1 do
 		if Land[y, x] <> 0 then LandPixels[y, x]:= p^[x] or $FF000000;
 	p:= @(p^[Surface^.pitch div 4]);
 	end;
 if SDL_MustLock(Surface) then
 	SDL_UnlockSurface(Surface);
 GenBlank(EdgeTemplates[SelectTemplate]);
 AddProgress;
-tmpsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, LAND_WIDTH+1, LAND_HEIGHT+1, 32, RMask, GMask, BMask, 0);
+tmpsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, LAND_WIDTH, LAND_HEIGHT, 32, RMask, GMask, BMask, 0);
 TryDo(tmpsurf <> nil, 'Error creating pre-land surface', true);
 ColorizeLand(tmpsurf);
 AddOnLandObjects(tmpsurf);
 var tmpsurf: PSDL_Surface;
 begin
 WriteLnToConsole('Generating forts land...');
 tmpsurf:= LoadImage(Pathz[ptForts] + '/' + ClansArray[0]^.Teams[0]^.FortName + 'L', true, true, true);
-BlitImageAndGenerateCollisionInfo(0, 0, LAND_WIDTH+1, tmpsurf);
+BlitImageAndGenerateCollisionInfo(0, 0, LAND_HEIGHT, tmpsurf);
 SDL_FreeSurface(tmpsurf);
 tmpsurf:= LoadImage(Pathz[ptForts] + '/' + ClansArray[1]^.Teams[0]^.FortName + 'R', true, true, true);
-BlitImageAndGenerateCollisionInfo(2048, 0, LAND_WIDTH+1, tmpsurf);
+BlitImageAndGenerateCollisionInfo(LAND_WIDTH - 1024, 0, LAND_HEIGHT, tmpsurf);
 SDL_FreeSurface(tmpsurf);
 end;
 procedure LoadMap;
 var tmpsurf: PSDL_Surface;
 begin
 WriteLnToConsole('Loading land from file...');
 AddProgress;
 tmpsurf:= LoadImage(Pathz[ptMapCurrent] + '/map', true, true, true);
-TryDo((tmpsurf^.w = LAND_WIDTH+1) and (tmpsurf^.h = LAND_HEIGHT+1), 'Map dimensions should be 4096x2048!', true);
+TryDo((tmpsurf^.w <= LAND_WIDTH) and (tmpsurf^.h <= LAND_HEIGHT), 'Map dimensions too big!', true);
 TryDo(tmpsurf^.format^.BytesPerPixel = 4, 'Map should be 32bit', true);
-BlitImageAndGenerateCollisionInfo(0, 0, LAND_WIDTH+1, tmpsurf);
+BlitImageAndGenerateCollisionInfo(0, 0, LAND_WIDTH, tmpsurf);
 SDL_FreeSurface(tmpsurf);
 end;
 procedure GenMap;
-var x, y: LongInt;
-c: LongWord;
 begin
 LoadThemeConfig;
 if (GameFlags and gfForts) = 0 then
 if Pathz[ptMapCurrent] <> '' then LoadMap
 else GenLandSurface
 else MakeFortsMap;
 AddProgress;
 {$IFDEF DEBUGFILE}LogLandDigest;{$ENDIF}
-for y:= 0 to 63 do
-	for x:= 0 to 127 do
-	    LandDirty[y, x]:= 0;  // TODO - ask unC0Rr why he took this out of merge - doesn't it need initialising? seems random values could result in some unintended smoothing of initial map edges. also be slower.
-// experiment hardcoding cave
-for y:= 0 to LAND_HEIGHT do
-begin
-Land[y, 0]:= COLOR_INDESTRUCTIBLE;
-Land[y, 1]:= COLOR_INDESTRUCTIBLE;
-Land[y, 2]:= COLOR_INDESTRUCTIBLE;
-Land[y, LAND_WIDTH-2]:= COLOR_INDESTRUCTIBLE;
-Land[y, LAND_WIDTH-1]:= COLOR_INDESTRUCTIBLE;
-Land[y, LAND_WIDTH]:= COLOR_INDESTRUCTIBLE;
-if y mod 32 < 16 then c:= $FF000000
-else c:= $FF00FFFF;
-LandPixels[y, 0]:= c;
-LandPixels[y, 1]:= c;
-LandPixels[y, 2]:= c;
-LandPixels[y, LAND_WIDTH-2]:= c;
-LandPixels[y, LAND_WIDTH-1]:= c;
-LandPixels[y, LAND_WIDTH]:= c;
-end;
-for x:= 0 to LAND_WIDTH do
-begin
-Land[0, x]:= COLOR_INDESTRUCTIBLE;
-Land[1, x]:= COLOR_INDESTRUCTIBLE;
-Land[2, x]:= COLOR_INDESTRUCTIBLE;
-if x mod 32 < 16 then c:= $FF000000
-else c:= $FF00FFFF;
-LandPixels[0, x]:= c;
-LandPixels[1, x]:= c;
-LandPixels[2, x]:= c;
-end;
 UpdateLandTexture(0, LAND_HEIGHT);
 end;
 function GenPreview: TPreview;
 begin
 Preview[y, x]:= 0;
 for bit:= 0 to 7 do
 begin
 t:= 0;
-for yy:= y * 16 to y * 16 + 7 do
+for yy:= y * (LAND_HEIGHT div 128) to y * (LAND_HEIGHT div 128) + 7 do
-for xx:= x * 128 + bit * 8 to x * 128 + bit * 8 + 7 do
+for xx:= x * (LAND_WIDTH div 32) + bit * 8 to x * (LAND_WIDTH div 32) + bit * 8 + 7 do
 if Land[yy, xx] <> 0 then inc(t);
 if t > 8 then Preview[y, x]:= Preview[y, x] or ($80 shr bit)
 end
 end;
 GenPreview:= Preview
 end;
 procedure UpdateLandTexture(Y, Height: LongInt);
 begin
 if (Height <= 0) then exit;
-TryDo((Y >= 0) and (Y <= LAND_HEIGHT), 'UpdateLandTexture: wrong Y parameter', true);
-TryDo(Y + Height <= LAND_WIDTH, 'UpdateLandTexture: wrong Height parameter', true);
+TryDo((Y >= 0) and (Y < LAND_HEIGHT), 'UpdateLandTexture: wrong Y parameter', true);
+TryDo(Y + Height <= LAND_HEIGHT, 'UpdateLandTexture: wrong Height parameter', true);
 if LandTexture = nil then
-	LandTexture:= NewTexture(LAND_WIDTH+1, LAND_HEIGHT+1, @LandPixels)
+	LandTexture:= NewTexture(LAND_WIDTH, LAND_HEIGHT, @LandPixels)
 else
 	begin
 	glBindTexture(GL_TEXTURE_2D, LandTexture^.id);
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, Y, LAND_WIDTH+1, Height, GL_RGBA, GL_UNSIGNED_BYTE, @LandPixels[Y, 0]);
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, Y, LAND_WIDTH, Height, GL_RGBA, GL_UNSIGNED_BYTE, @LandPixels[Y, 0]);
 	end
 end;
 initialization

changeset 1760	55a1edd97911
parent 1754	a37392548124
child 1767	d0560fe17932