Changeset 707

Timestamp:

Aug 19, 2025, 9:36:23 PM (25 hours ago)

Author:

chronos

Message:

• 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.

Location:

trunk

Files:

• MiniMap.pas (modified) (1 diff)
• Settings.pas (modified) (2 diffs)
• Start.pas (modified) (2 diffs)

trunk/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;

trunk/Settings.pas

@@ -6 +6 @@
   Classes, SysUtils, FileUtil, Dialogs, LCLProc, ScreenTools, Messg, ButtonA,
   Directories, DrawDlg, ButtonC, KeyBindings, Languages, ListBoxEx,
-  {$IFDEF DPI}Dpi.Forms, Dpi.Controls, Dpi.Graphics, Dpi.StdCtrls, System.UITypes{$ELSE}
+  {$IFDEF DPI}Dpi.Forms, Dpi.Controls, Dpi.Graphics, Dpi.StdCtrls{$ELSE}
   Forms, Controls, Graphics, StdCtrls{$ENDIF}, Controls;
 
@@ -56 +56 @@
     LocalGamma: Integer;
     LocalKeyBindings: TKeyBindings;
-    LocalMusicEnabled: Integer;
     LocalMusicVolume: Integer;
     CurrentKeyBinding: TKeyBinding;

trunk/Start.pas

@@ -5 +5 @@
 
 uses
-  GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area, Types,
-  LCLIntf, LCLType, SysUtils, Classes, BaseWin, ListBoxEx, LazFileUtils,
+  GameServer, Messg, ButtonBase, ButtonA, ButtonC, ButtonB, Area,
+  LCLIntf, LCLType, SysUtils, Classes, BaseWin, ListBoxEx, LazFileUtils, Math,
   Registry, DrawDlg, Generics.Collections, Protocol, MiniMap, Brain, Translator,
   {$IFDEF DPI}System.UITypes, Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.StdCtrls,
@@ -520 +520 @@
   r0, r1: HRgn;
   Location: TPoint;
+  Shift: TPoint;
 begin
   if FullScreen then begin
-    Location := Point(Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - 800) * 3 div 8,
-      Screen.PrimaryMonitor.Top + Screen.PrimaryMonitor.Height - Height - (Screen.PrimaryMonitor.Height - 600) div 3);
+    Shift := Point(((Screen.PrimaryMonitor.Width - Min(Screen.PrimaryMonitor.Width, 800)) * 3 div 8),
+      (Screen.PrimaryMonitor.Height - Min(Screen.PrimaryMonitor.Height, 600)) div 3);
+    Location := Point(Screen.PrimaryMonitor.Left + Shift.X,
+      Screen.PrimaryMonitor.Top + Screen.PrimaryMonitor.Height - Height - Shift.Y);
     BoundsRect := Bounds(Location.X, Location.Y, Width, Height);