Changeset 72 for trunk/LocalPlayer/Term.pas

Timestamp:

Jan 15, 2017, 11:47:01 AM (8 years ago)

Author:

chronos

Message:

• Modified: Unified direct pixel access using TPixelPointer.

File:

• trunk/LocalPlayer/Term.pas (modified) (5 diffs)

trunk/LocalPlayer/Term.pas

@@ -4054 +4054 @@
 var
   uix, cix, x, y, Loc, i, hw, xm, cm, cmPolOcean, cmPolNone: integer;
-  PrevMiniPixel, MiniPixel: PPixel32;
+  PrevMiniPixel, MiniPixel: TPixelPointer;
 begin
   cmPolOcean := GrExt[HGrSystem].Data.Canvas.Pixels[101, 67];
@@ -4065 +4065 @@
   end;
   Mini.BeginUpdate;
+  MiniPixel.Init(Mini);
+  PrevMiniPixel.Init(Mini);
   for y := 0 to G.ly - 1 do
   begin
@@ -4074 +4076 @@
         begin
           xm := ((x - xwMini) * 2 + i + y and 1 - hw + G.lx * 5) mod (G.lx * 2);
-          MiniPixel := GetBitmapPixelPtr(Mini, xm, y);
+          MiniPixel.SetXY(xm, y);
           cm := MiniColors[MyMap[Loc] and fTerrain, i];
           if ClientMode = cEditMap then
@@ -4099 +4101 @@
             if y > 0 then begin
               // 2x2 city dot covers two lines
-              PrevMiniPixel := GetBitmapPixelPtr(Mini, xm, y - 1);
-              PrevMiniPixel^.B := cm shr 16;
-              PrevMiniPixel^.G := cm shr 8 and $FF;
-              PrevMiniPixel^.R := cm and $FF;
+              PrevMiniPixel.SetXY(xm, y - 1);
+              PrevMiniPixel.Pixel^.B := cm shr 16;
+              PrevMiniPixel.Pixel^.G := cm shr 8 and $FF;
+              PrevMiniPixel.Pixel^.R := cm and $FF;
             end
           end
@@ -4131 +4133 @@
               cm := Tribe[MyRO.Territory[Loc]].Color;
           end;
-          MiniPixel^.B := cm shr 16;
-          MiniPixel^.G := cm shr 8 and $FF;
-          MiniPixel^.R := cm and $FF;
+          MiniPixel.Pixel^.B := cm shr 16;
+          MiniPixel.Pixel^.G := cm shr 8 and $FF;
+          MiniPixel.Pixel^.R := cm and $FF;
         end;
       end;