Changeset 717 for branches/zoom/MiniMap.pas

Timestamp:

Jan 10, 2026, 12:15:35 PM (4 weeks ago)

Author:

chronos

Message:

Merged revision(s) 705-716 from trunk:

• Fixed: Subversion properties.
• Fixed: Better start screen location calculation for lower than 800x600 resolutions to make visible entire window.
• Fixed: Memory overflow in minimap drawing with some higher DPI settings.
• Fixed: Crashes with mini map drawing in Start screen with some DPI resolutions.
• Added: Enter key confirms battle dialog window.
• Fixed: Potential battle dialog drawing issue.
• Modified: Code cleanup.
• Fixed: Disable auto selection of input text in message dialog.
• Fixed: Edit boxes to have black background and blue selection.
• Fixed: Automatically create Saved and Maps user data directories if they don't exist yet.
• Modified: Code cleanup.
• Fixed: Wrong unit models opened after click on Military report foreign units.
• Modified: Do not store .png file extension in graphics names in book files. This is for compatibility with older C-evo versions.
• Fixed: Support both books with graphics name with and without .png file extensions.

Location:

branches/zoom

Files:

• . (modified) (1 prop)
• MiniMap.pas (modified) (6 diffs)

branches/zoom/MiniMap.pas

@@ -200 +200 @@
             else CM := Colors[Tile and fTerrain, I];
           if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine)) then begin
+          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine) - 1) then begin
             MiniPixel.PixelB := (CM shr 16) and $ff;
             MiniPixel.PixelG := (CM shr 8) and $ff;
@@ -239 +239 @@
           fTerrain, I];
         if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-        (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine)) then begin
+        (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine) - 1) then begin
           MiniPixel.PixelB := ((CM shr 16) and $FF) * Brightness div 3;
           MiniPixel.PixelG := ((CM shr 8) and $FF) * Brightness div 3;
@@ -283 +283 @@
               PrevMiniPixel.SetX(XM);
               if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * PrevMiniPixel.BytesPerLine)) then begin
+              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * PrevMiniPixel.BytesPerLine) - 1) then begin
                 PrevMiniPixel.PixelB := CM shr 16;
                 PrevMiniPixel.PixelG:= CM shr 8 and $FF;
@@ -296 +296 @@
             CM := Colors[Tile and fTerrain, I];
           if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine)) then begin
+          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine) - 1) then begin
             MiniPixel.PixelB := (CM shr 16) and $ff;
             MiniPixel.PixelG := (CM shr 8) and $ff;
@@ -368 +368 @@
               PrevMiniPixel.SetX(XM);
               if (PByte(PrevMiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * PrevMiniPixel.BytesPerLine)) then begin
+              (PByte(PrevMiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * PrevMiniPixel.BytesPerLine) - 1) then begin
                 PrevMiniPixel.PixelB := (CM shr 16) and $ff;
                 PrevMiniPixel.PixelG := (CM shr 8) and $ff;
@@ -393 +393 @@
           end;
           if (PByte(MiniPixel.Pixel) >= Bitmap.RawImage.Data) and
-          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine)) then begin
+          (PByte(MiniPixel.Pixel) < (Bitmap.RawImage.Data + YY * MiniPixel.BytesPerLine) - 1) then begin
             MiniPixel.PixelB := (CM shr 16) and $ff;
             MiniPixel.PixelG := (CM shr 8) and $ff;