Changeset 506 for trunk/LocalPlayer

Timestamp:

Dec 25, 2023, 11:35:51 AM (11 months ago)

Author:

chronos

Message:

• Fixed: Better PixelPointer range checking.

Location:

trunk/LocalPlayer

Files:

• Help.pas (modified) (2 diffs)
• IsoEngine.pas (modified) (5 diffs)
• MessgEx.pas (modified) (1 diff)
• PVSB.pas (modified) (1 diff)
• Wonders.pas (modified) (2 diffs)

trunk/LocalPlayer/Help.pas

@@ -462 +462 @@
   ySrc := (iix div 7 + 1) * ySizeBig;
   PaintPtr := TPixelPointer.Create(OffScreen, ScaleToNative(x0), ScaleToNative(y0));
-  CoalPtr := TPixelPointer.Create(Templates.Data, ScaleToNative(xCoal), ScaleToNative(yCoal));
+  CoalPtr := TPixelPointer.Create(Templates.Data, ScaleToNative(xCoal),
+    ScaleToNative(yCoal));
   for dy := -1 to 1 do
     ImpPtr[dy] := TPixelPointer.Create(BigImp, ScaleToNative(xSrc), ScaleToNative(ySrc));
@@ -476 +477 @@
           for dy := -1 to 1 do begin
             ImpPtr[dy].SetX(xx);
-            if ((Y + ScaleToNative(dy)) shr 1 < 0) or ((Y + ScaleToNative(dy)) shr 1 >= ScaleToNative(ySizeBig)) or
-              ((X + ScaleToNative(dx)) shr 1 < 0) or ((X + ScaleToNative(dx)) shr 1 >= ScaleToNative(xSizeBig)) or
+            if ((Y + ScaleToNative(dy)) shr 1 < 0) or
+              ((Y + ScaleToNative(dy)) shr 1 >= ScaleToNative(ySizeBig)) or
+              ((X + ScaleToNative(dx)) shr 1 < 0) or
+              ((X + ScaleToNative(dx)) shr 1 >= ScaleToNative(xSizeBig)) or
               ((Y + ScaleToNative(dy)) shr 1 < ScaleToNative(nHeaven)) and
-              (ImpPtr[dy].Pixel^.B shl 16 + ImpPtr[dy].Pixel^.G shl 8 +
-              ImpPtr[dy].Pixel^.R = Heaven[(ScaleFromNative(Y + ScaleToNative(dy))) shr 1]) then
+              (ImpPtr[dy].PixelB shl 16 + ImpPtr[dy].PixelG shl 8 +
+              ImpPtr[dy].PixelR = Heaven[(ScaleFromNative(Y + ScaleToNative(dy))) shr 1]) then
               Sum := Sum + 9 * 255
             else
-              Sum := Sum + ImpPtr[dy].Pixel^.B + 5 * ImpPtr[dy].Pixel^.G + 3 *
-                ImpPtr[dy].Pixel^.R;
+              Sum := Sum + ImpPtr[dy].PixelB + 5 * ImpPtr[dy].PixelG + 3 *
+                ImpPtr[dy].PixelR;
           end;
         end;
         if Sum < MaxSum then begin // No saturation
-          Sum := 1 shl 22 - (MaxSum - Sum) * (256 - CoalPtr.Pixel^.B * 2);
-          PaintPtr.Pixel^.B := Min(PaintPtr.Pixel^.B * Sum shr 22, 255);
-          PaintPtr.Pixel^.G := Min(PaintPtr.Pixel^.G * Sum shr 22, 255);
-          PaintPtr.Pixel^.R := Min(PaintPtr.Pixel^.R * Sum shr 22, 255);
+          Sum := 1 shl 22 - (MaxSum - Sum) * (256 - CoalPtr.PixelB * 2);
+          PaintPtr.PixelB := Min(PaintPtr.PixelB * Sum shr 22, 255);
+          PaintPtr.PixelG := Min(PaintPtr.PixelG * Sum shr 22, 255);
+          PaintPtr.PixelR := Min(PaintPtr.PixelR * Sum shr 22, 255);
         end;
         PaintPtr.NextPixel;

trunk/LocalPlayer/IsoEngine.pas

@@ -266 +266 @@
         for Y := 0 to yyt * 3 - 1 do begin
           MaskLine[Y].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + TSpriteSize[I].Left));
-          if MaskLine[Y].Pixel^.B = 0 then Border := False;
+          if MaskLine[Y].PixelB = 0 then Border := False;
         end;
         if Border then Inc(TSpriteSize[I].Left);
@@ -275 +275 @@
         for X := 0 to xxt * 2 - 1 do begin
           MaskLine[TSpriteSize[I].Top].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + X));
-          if MaskLine[TSpriteSize[I].Top].Pixel^.B = 0 then Border := False;
+          if MaskLine[TSpriteSize[I].Top].PixelB = 0 then Border := False;
         end;
         if Border then Inc(TSpriteSize[I].Top);
@@ -284 +284 @@
         for Y := 0 to yyt * 3 - 1 do begin
           MaskLine[Y].SetX(ScaleToNative(xSrc * (xxt * 2 + 1) + TSpriteSize[I].Right));
-          if MaskLine[Y].Pixel^.B = 0 then Border := False;
+          if MaskLine[Y].PixelB = 0 then Border := False;
         end;
         if Border then Dec(TSpriteSize[I].Right);
@@ -293 +293 @@
         for X := 0 to xxt * 2 - 1 do begin
           MaskLine[TSpriteSize[I].Bottom - 1].SetX(ScaleToNative(1 + xSrc * (xxt * 2 + 1) + X));
-          if MaskLine[TSpriteSize[I].Bottom - 1].Pixel^.B = 0 then Border := False;
+          if MaskLine[TSpriteSize[I].Bottom - 1].PixelB = 0 then Border := False;
         end;
         if Border then Dec(TSpriteSize[I].Bottom);
@@ -1404 +1404 @@
 begin
   for I := 0 to Length - 1 do begin
-    Line^.Pixel^.B := (Line^.Pixel^.B shr 1) and $7F;
-    Line^.Pixel^.G := (Line^.Pixel^.G shr 1) and $7F;
-    Line^.Pixel^.R := (Line^.Pixel^.R shr 1) and $7F;
+    Line^.PixelB := (Line^.PixelB shr 1) and $7F;
+    Line^.PixelG := (Line^.PixelG shr 1) and $7F;
+    Line^.PixelR := (Line^.PixelR shr 1) and $7F;
     Line^.NextPixel;
   end;

trunk/LocalPlayer/MessgEx.pas

@@ -267 +267 @@
             (yDst + dy < hScrewed) then begin
               Screwed[xDst + dx, yDst + dy, 0] := Screwed[xDst + dx, yDst + dy, 0]
-                + Share * SrcPtr.Pixel^.B;
+                + Share * SrcPtr.PixelB;
               Screwed[xDst + dx, yDst + dy, 1] := Screwed[xDst + dx, yDst + dy, 1]
-                + Share * SrcPtr.Pixel^.G;
+                + Share * SrcPtr.PixelG;
               Screwed[xDst + dx, yDst + dy, 2] := Screwed[xDst + dx, yDst + dy, 2]
-                + Share * SrcPtr.Pixel^.R;
+                + Share * SrcPtr.PixelR;
               Screwed[xDst + dx, yDst + dy, 3] := Screwed[xDst + dx, yDst + dy,
                 3] + Share;

trunk/LocalPlayer/PVSB.pas

@@ -189 +189 @@
   ScrollBar.OnChange := ScrollBarChanged;
   ScrollBar.Parent := Parent;
-  ScrollBar.Width := 24;
+  ScrollBar.Width := 16;
 end;
 

trunk/LocalPlayer/Wonders.pas

@@ -122 +122 @@
         ((ax < amax1 * X) or (ax > amin3 * X))) then begin
         for ch := 0 to 2 do begin
-          C := Line[0].Pixel^.Planes[ch] - Darken;
-          if C < 0 then Line[0].Pixel^.Planes[ch] := 0
-            else Line[0].Pixel^.Planes[ch] := C;
-          C := Line[1].Pixel^.Planes[ch] - Darken;
-          if C < 0 then Line[1].Pixel^.Planes[ch] := 0
-            else Line[1].Pixel^.Planes[ch] := C;
-          C := Line[2].Pixel^.Planes[ch] - Darken;
-          if C < 0 then Line[2].Pixel^.Planes[ch] := 0
-            else Line[2].Pixel^.Planes[ch] := C;
-          C := Line[3].Pixel^.Planes[ch] - Darken;
-          if C < 0 then Line[3].Pixel^.Planes[ch] := 0
-            else Line[3].Pixel^.Planes[ch] := C;
+          C := Line[0].PixelPlane[ch] - Darken;
+          if C < 0 then Line[0].PixelPlane[ch] := 0
+            else Line[0].PixelPlane[ch] := C;
+          C := Line[1].PixelPlane[ch] - Darken;
+          if C < 0 then Line[1].PixelPlane[ch] := 0
+            else Line[1].PixelPlane[ch] := C;
+          C := Line[2].PixelPlane[ch] - Darken;
+          if C < 0 then Line[2].PixelPlane[ch] := 0
+            else Line[2].PixelPlane[ch] := C;
+          C := Line[3].PixelPlane[ch] - Darken;
+          if C < 0 then Line[3].PixelPlane[ch] := 0
+            else Line[3].PixelPlane[ch] := C;
         end;
       end;
@@ -163 +163 @@
   for Y := 0 to ScaleToNative(ySizeBig) - 1 do begin
     for X := 0 to ScaleToNative(xSizeBig) - 1 do begin
-      Darken := ((255 - Src.Pixel^.B) * 3 + (255 - Src.Pixel^.G) *
-        15 + (255 - Src.Pixel^.R) * 9) div 128;
+      Darken := ((255 - Src.PixelB) * 3 + (255 - Src.PixelG) *
+        15 + (255 - Src.PixelR) * 9) div 128;
       for ch := 0 to 2 do begin
-        C := Dst.Pixel^.Planes[ch] - Darken;
-        if C < 0 then Dst.Pixel^.Planes[ch] := 0
-          else Dst.Pixel^.Planes[ch] := C;
+        C := Dst.PixelPlane[ch] - Darken;
+        if C < 0 then Dst.PixelPlane[ch] := 0
+          else Dst.PixelPlane[ch] := C;
       end;
       Src.NextPixel;