hedgewars: comparison hedgewars/uLand.pas

equal deleted inserted replaced

-:128ace913837
+:f39f0f614dbf
 maskOnly: boolean;
 procedure PrettifyLandAlpha();
 begin
 if (cReducedQuality and rqBlurryLand) <> 0 then
-PrettifyAlpha2D(LandPixels, LAND_HEIGHT div 2, LAND_WIDTH div 2)
+PrettifyAlpha2D(LAND_HEIGHT div 2, LAND_WIDTH div 2)
 else
-PrettifyAlpha2D(LandPixels, LAND_HEIGHT, LAND_WIDTH);
+PrettifyAlpha2D(LAND_HEIGHT, LAND_WIDTH);
 end;
 procedure DrawBorderFromImage(Surface: PSDL_Surface);
 var tmpsurf: PSDL_Surface;
 x, yd, yu: LongInt;
 for i:= max(s, y - 8) to y - 1 do
 begin
 if ((x + i) and 16) = 0 then c:= c1 else c:= c2;
 if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[i, x]:= c
+LandPixelSet(i, x, c)
 else
-LandPixels[i div 2, x div 2]:= c
+LandPixelSet(i div 2, x div 2, c)
 end;
 s:= LAND_HEIGHT
 end
 else
 else
 if s + 8 > y then
 begin
 if ((x + y) and 16) = 0 then c:= c1 else c:= c2;
 if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[y, x]:= c
+LandPixelSet(y, x, c)
 else
-LandPixels[y div 2, x div 2]:= c
+LandPixelSet(y div 2, x div 2, c)
 end;
 end;
 // horizontal
 s:= LAND_WIDTH;
 for i:= max(s, x - 8) to x - 1 do
 begin
 if ((y + i) and 16) = 0 then c:= c1 else c:= c2;
 if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[y, i]:= c
+LandPixelSet(y, i, c)
 else
-LandPixels[y div 2, i div 2]:= c
+LandPixelSet(y div 2, i div 2, c)
 end;
 s:= LAND_WIDTH
 end
 else
 else
 if s + 8 > x then
 begin
 if ((x + y) and 16) = 0 then c:= c1 else c:= c2;
 if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[y, x]:= c
+LandPixelSet(y, x, c)
 else
-LandPixels[y div 2, x div 2]:= c
+LandPixelSet(y div 2, x div 2, c)
 end;
 end
 end;
 procedure ColorizeLandFast(mapsurf: PSDL_Surface);
 for y:= 0 to LAND_HEIGHT - 1 do
 begin
 for x:= 0 to LAND_WIDTH - 1 do
 if LandGet(y, x) <> 0 then
 if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[y, x]:= p^[x]// or AMask
+LandPixelSet(y, x, p^[x])// or AMask
 else
-LandPixels[y div 2, x div 2]:= p^[x];
+LandPixelSet(y div 2, x div 2, p^[x]);
 p:= PLongwordArray(@(p^[Surface^.pitch div 4]));
 end;
 if SDL_MustLock(Surface) then
 (((LandGet(y, x-1) = lfBasic) and ((LandGet(y+1,x) = lfBasic)) or (LandGet(y-1,x) = lfBasic)) or
 ((LandGet(y, x+1) = lfBasic) and ((LandGet(y-1,x) = lfBasic) or (LandGet(y+1,x) = lfBasic)))) then
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
-if (LandGet(y, x-1) = lfBasic) and (LandPixels[y, x-1] and AMask <> 0) then
+if (LandGet(y, x-1) = lfBasic) and (LandPixelGet(y, x-1) and AMask <> 0) then
-LandPixels[y, x]:= LandPixels[y, x-1]
+LandPixelSet(y, x, LandPixelGet(y, x-1))
-else if (LandGet(y, x+1) = lfBasic) and (LandPixels[y, x+1] and AMask <> 0) then
+else if (LandGet(y, x+1) = lfBasic) and (LandPixelGet(y, x+1) and AMask <> 0) then
-LandPixels[y, x]:= LandPixels[y, x+1]
+LandPixelSet(y, x, LandPixelGet(y, x+1))
-else if (LandGet(y-1, x) = lfBasic) and (LandPixels[y-1, x] and AMask <> 0) then
+else if (LandGet(y-1, x) = lfBasic) and (LandPixelGet(y-1, x) and AMask <> 0) then
-LandPixels[y, x]:= LandPixels[y-1, x]
+LandPixelSet(y, x, LandPixelGet(y-1, x))
-else if (LandGet(y+1, x) = lfBasic) and (LandPixels[y+1, x] and AMask <> 0) then
+else if (LandGet(y+1, x) = lfBasic) and (LandPixelGet(y+1, x) and AMask <> 0) then
-LandPixels[y, x]:= LandPixels[y+1, x];
+LandPixelSet(y, x, LandPixelGet(y+1, x));
-if (((LandPixels[y,x] and AMask) shr AShift) > 10) then
+if (((LandPixelGet(y,x) and AMask) shr AShift) > 10) then
-LandPixels[y,x]:= (LandPixels[y,x] and (not AMask)) or (128 shl AShift)
+LandPixelSet(y, x, (LandPixelGet(y,x) and (not AMask)) or (128 shl AShift))
 end;
 LandSet(y, x, lfObject)
 end
 else if (LandGet(y, x) = 0) and
 (((LandGet(y, x-1) = lfBasic) and (LandGet(y+1,x-1) = lfBasic) and (LandGet(y+2,x) = lfBasic)) or
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
-if (LandGet(y, x-1) = lfBasic) and (LandPixels[y,x-1] and AMask <> 0) then
+if (LandGet(y, x-1) = lfBasic) and (LandPixelGet(y,x-1) and AMask <> 0) then
-LandPixels[y, x]:= LandPixels[y, x-1]
+LandPixelSet(y, x, LandPixelGet(y, x-1))
-else if (LandGet(y, x+1) = lfBasic) and (LandPixels[y,x+1] and AMask <> 0) then
+else if (LandGet(y, x+1) = lfBasic) and (LandPixelGet(y,x+1) and AMask <> 0) then
-LandPixels[y, x]:= LandPixels[y, x+1]
+LandPixelSet(y, x, LandPixelGet(y, x+1))
-else if (LandGet(y+1, x) = lfBasic) and (LandPixels[y+1,x] and AMask <> 0) then
+else if (LandGet(y+1, x) = lfBasic) and (LandPixelGet(y+1,x) and AMask <> 0) then
-LandPixels[y, x]:= LandPixels[y+1, x]
+LandPixelSet(y, x, LandPixelGet(y+1, x))
-else if (LandGet(y-1, x) = lfBasic) and (LandPixels[y-1,x] and AMask <> 0) then
+else if (LandGet(y-1, x) = lfBasic) and (LandPixelGet(y-1,x) and AMask <> 0) then
-LandPixels[y, x]:= LandPixels[y-1, x];
+LandPixelSet(y, x, LandPixelGet(y-1, x));
-if (((LandPixels[y,x] and AMask) shr AShift) > 10) then
+if (((LandPixelGet(y,x) and AMask) shr AShift) > 10) then
-LandPixels[y,x]:= (LandPixels[y,x] and (not AMask)) or (64 shl AShift)
+LandPixelSet(y, x, (LandPixelGet(y,x) and (not AMask)) or (64 shl AShift))
 end;
 LandSet(y, x, lfObject)
 end;
 AddProgress();
 c:= AMask
 else
 c:= AMask or RMask or GMask; // FF00FFFF
 if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[y, x]:= c
+LandPixelSet(y, x, c)
 else
-LandPixels[y div 2, x div 2]:= c
+LandPixelSet(y div 2, x div 2, c)
 end
 end;
 procedure GenMap;
 var x, y, w, c, c2: Longword;
 else
 c2:= AMask or RMask or GMask; // yellow
 if (cReducedQuality and rqBlurryLand) = 0 then
 begin
-LandPixels[y, leftX + w]:= c;
+LandPixelSet(y, leftX + w, c);
-LandPixels[y, rightX - w]:= c2;
+LandPixelSet(y, rightX - w, c2);
 end
 else
 begin
-LandPixels[y div 2, (leftX + w) div 2]:= c;
+LandPixelSet(y div 2, (leftX + w) div 2, c);
-LandPixels[y div 2, (rightX - w) div 2]:= c2;
+LandPixelSet(y div 2, (rightX - w) div 2, c2);
 end;
 end;
 // Top border
 for x:= LongWord(leftX) to LongWord(rightX) do
 c:= AMask // black
 else
 c:= AMask or RMask or GMask; // yellow
 if (cReducedQuality and rqBlurryLand) = 0 then
-LandPixels[topY + w, x]:= c
+LandPixelSet(topY + w, x, c)
 else
-LandPixels[(topY + w) div 2, x div 2]:= c;
+LandPixelSet((topY + w) div 2, x div 2, c);
 end;
 end;
 end;
 // Bottom border
 begin
 if (cReducedQuality and rqBlurryLand) = 0 then
 for x:= LongWord(leftX) to LongWord(rightX) do
 for y:= LongWord(topY) to LAND_HEIGHT-1 do
 begin
-w:= LandPixels[y,x];
+w:= LandPixelGet(y,x);
 w:= round(((w shr RShift and $FF) * RGB_LUMINANCE_RED +
 (w shr BShift and $FF) * RGB_LUMINANCE_GREEN +
 (w shr GShift and $FF) * RGB_LUMINANCE_BLUE));
 if w > 255 then
 w:= 255;
-w:= (w and $FF shl RShift) or (w and $FF shl BShift) or (w and $FF shl GShift) or (LandPixels[y,x] and AMask);
+w:= (w and $FF shl RShift) or (w and $FF shl BShift) or (w and $FF shl GShift) or (LandPixelGet(y,x) and AMask);
-LandPixels[y,x]:= w or (LandPixels[y, x] and AMask)
+LandPixelSet(y, x, w or (LandPixelGet(y, x) and AMask))
 end
 else
 for x:= LongWord(leftX div 2) to LongWord(rightX div 2) do
 for y:= LongWord(topY div 2) to LAND_HEIGHT-1 div 2 do
 begin
-w:= LandPixels[y div 2,x div 2];
+w:= LandPixelGet(y div 2,x div 2);
 w:= ((w shr RShift and $FF) +  (w shr BShift and $FF) + (w shr GShift and $FF)) div 3;
-w:= (w and $FF shl RShift) or (w and $FF shl BShift) or (w and $FF shl GShift) or (LandPixels[y div 2,x div 2] and AMask);
+w:= (w and $FF shl RShift) or (w and $FF shl BShift) or (w and $FF shl GShift) or (LandPixelGet(y div 2,x div 2) and AMask);
-LandPixels[y,x]:= w or (LandPixels[y div 2, x div 2] and AMask)
+LandPixelSet(y, x, w or (LandPixelGet(y div 2, x div 2) and AMask))
 end
 end;
 PrettifyLandAlpha();
 procedure chSendLandDigest(var s: shortstring);
 var i: LongInt;
 landPixelDigest  : LongInt;
 begin
 landPixelDigest:= 1;
-//    for i:= 0 to LAND_HEIGHT-1 do
+for i:= 0 to LAND_HEIGHT-1 do
-//        landPixelDigest:= Adler32Update(landPixelDigest, @LandGet(i,x), 2);
+landPixelDigest:= Adler32Update(landPixelDigest, LandRow(i), LAND_WIDTH*2);
 s:= 'M' + IntToStr(syncedPixelDigest)+'|'+IntToStr(landPixelDigest);
 ScriptSetString('LandDigest',IntToStr(landPixelDigest));
 chLandCheck(s);
 end;
 procedure freeModule;
 begin
 DisposeLand;
-SetLength(LandPixels, 0, 0);
 SetLength(LandDirty, 0, 0);
 end;
 end.

branch	transitional_engine
changeset 15901	f39f0f614dbf
parent 15900	128ace913837
child 15904	33798b649d9c