Changeset 545

Timestamp:

Apr 17, 2024, 10:23:55 AM (13 days ago)

Author:

chronos

Message:

• Fixed: Incorrect range checking in scaled bitmap drawing method.

Location:

trunk

Files:

• LocalPlayer/Term.pas (modified) (2 diffs)
• MiniMap.pas (modified) (1 diff)
• Packages/DpiControls/Dpi.Common.pas (modified) (2 diffs)

trunk/LocalPlayer/Term.pas

@@ -2697 +2697 @@
 
         MiniMap.Size := Point(G.lx, G.ly);
-        for I := 0 to nPl - 1 do
-        begin
+        MiniMap.Bitmap.SetSize(MiniMap.Size.X * 2, MiniMap.Size.Y);
+
+        for I := 0 to nPl - 1 do begin
           Tribe[I] := nil;
           TribeOriginal[I] := False;
@@ -6619 +6620 @@
             Application.ProcessMessages;
           Sleep(1);
-          Inc(SliceCount)
+          Inc(SliceCount);
         end;
         Ticks := NowPrecise;

trunk/MiniMap.pas

@@ -57 +57 @@
   for X := 0 to 11 do
     for Y := 0 to 1 do
-      Colors[x, y] := HGrSystem.Data.Canvas.Pixels[66 + x, 67 + y];
+      Colors[X, Y] := HGrSystem.Data.Canvas.Pixels[66 + X, 67 + Y];
 end;
 

trunk/Packages/DpiControls/Dpi.Common.pas

@@ -76 +76 @@
   end;
 
+  if XSrc < 0 then begin
+    X := X - XSrc;
+    Width := Width - XSrc;
+    XSrc := 0;
+  end;
+  if YSrc < 0 then begin
+    Y := Y - YSrc;
+    Height := Height - YSrc;
+    YSrc := 0;
+  end;
+
   if X < 0 then begin
     Width := Width + X;
@@ -86 +97 @@
     Y := 0;
   end;
-  if (X + Width) > Dest.Width then begin
+  if (X + Width) >= Dest.Width then begin
     Width := Dest.Width - X;
   end;
-  if (Y + Height) > Dest.Height then begin
+  if (Y + Height) >= Dest.Height then begin
     Height := Dest.Height - Y;
+  end;
+  if (Width < 0) or (Height < 0) then begin
+    Result := True;
+    Exit;
   end;