Changeset 60 for trunk/ScreenTools.pas

Timestamp:

Jan 13, 2017, 6:51:27 PM (7 years ago)

Author:

chronos

Message:

• Fixed: City mini map was drawn incorrectly.

File:

• trunk/ScreenTools.pas (modified) (3 diffs)

trunk/ScreenTools.pas

@@ -653 +653 @@
 // X channel = background amp (old Dst content), 128=original brightness
 var
-  i, Brightness, test: integer;
+  X, Y: Integer;
+  Brightness, test: integer;
   PixelSrc: ^Byte;
   PixelDst: PPixel32;
 begin
-  {TODO assert(Src.PixelFormat = pf8bit);}
-  assert(dst.PixelFormat = pf24bit);
+  //TODO Assert(Src.PixelFormat = pf8bit);
+  Assert(dst.PixelFormat = pf24bit);
   if xDst < 0 then
   begin
@@ -680 +681 @@
   dst.BeginUpdate;
   Src.BeginUpdate;
-  h := yDst + h;
-  while yDst < h do
-  begin
-    PixelDst := GetBitmapPixelPtr(dst, xDst, yDst);
-    PixelSrc := Src.ScanLine[ySrc] + xSrc;
-    for i := 0 to w - 1 do
-    begin
+  for Y := 0 to h - 1 do begin
+    PixelDst := GetBitmapPixelPtr(dst, xDst, yDst + Y);
+    PixelSrc := Pointer(GetBitmapPixelPtr(Src, xSrc, ySrc + Y));
+    for X := 0 to w - 1 do begin
       Brightness := PixelSrc^;
       test := (PixelDst^.R * Brightness) shr 7;
@@ -700 +698 @@
         PixelDst^.B := test; // Blue
       PixelDst := Pointer(PixelDst) + (Dst.RawImage.Description.BitsPerPixel shr 3);
-      PixelSrc := Pointer(PixelSrc) + 1;
-    end;
-    inc(yDst);
-    inc(ySrc);
+      PixelSrc := Pointer(PixelSrc) + (Src.RawImage.Description.BitsPerPixel shr 3);
+    end;
   end;
   src.EndUpdate;