Changeset 506 for trunk/LocalPlayer/Help.pas

Timestamp:

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

Author:

chronos

Message:

• Fixed: Better PixelPointer range checking.

File:

• trunk/LocalPlayer/Help.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;