Changeset 717 for branches/zoom/LocalPlayer/Draft.pas

Timestamp:

Jan 10, 2026, 12:15:35 PM (2 months 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)
• LocalPlayer/Draft.pas (modified) (6 diffs)

branches/zoom/LocalPlayer/Draft.pas

@@ -95 +95 @@
   Template := TBitmap.Create;
   Template.PixelFormat := TPixelFormat.pf24bit;
-  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes.png',
+  LoadGraphicFile(Template, GetGraphicsDir + DirectorySeparator + 'MiliRes' + PngExt,
     [gfNoGamma]);
 end;
@@ -415 +415 @@
 procedure TDraftDlg.SetDomain(D: Integer);
 
-  function Prio(fix: Integer): Integer;
+  function Prio(Fix: Integer): Integer;
   var
     FeaturePreq: Integer;
   begin
-    FeaturePreq := Feature[fix].Preq;
+    FeaturePreq := Feature[Fix].Preq;
     Assert(FeaturePreq <> preNA);
-    if fix < mcFirstNonCap then
-      Result := 10000 + fix
+    if Fix < mcFirstNonCap then
+      Result := 10000 + Fix
     else if FeaturePreq = preNone then
       Result := 20000
@@ -429 +429 @@
     else
       Result := 30000 + AdvValue[FeaturePreq];
-    if not (fix in AutoFeature) then
+    if not (Fix in AutoFeature) then
       Inc(Result, 90000);
   end;
@@ -471 +471 @@
 begin
   Domain := dGround;
-  while (Domain < dAir) and (upgrade[Domain, 0].Preq <> preNone) and
-    (MyRO.Tech[upgrade[Domain, 0].Preq] < tsApplicable) do
+  while (Domain < dAir) and (Upgrade[Domain, 0].Preq <> preNone) and
+    (MyRO.Tech[Upgrade[Domain, 0].Preq] < tsApplicable) do
     Inc(Domain);
 
@@ -478 +478 @@
   MaxLines := 0;
   for D := 0 to nDomains - 1 do
-    if (upgrade[D, 0].Preq = preNone) or
-      (MyRO.Tech[upgrade[D, 0].Preq] >= tsApplicable) then
+    if (Upgrade[D, 0].Preq = preNone) or
+      (MyRO.Tech[Upgrade[D, 0].Preq] >= tsApplicable) then
     begin
       Count := 0;
@@ -519 +519 @@
   begin
     for D := 0 to nDomains - 1 do
-      if (D <> Domain) and ((upgrade[D, 0].Preq = preNone) or
-        (MyRO.Tech[upgrade[D, 0].Preq] >= tsApplicable)) and
+      if (D <> Domain) and ((Upgrade[D, 0].Preq = preNone) or
+        (MyRO.Tech[Upgrade[D, 0].Preq] >= tsApplicable)) and
         (X >= xDomain + D * DomainPitch) and
         (X < xDomain + D * DomainPitch + 36) and (Y >= yDomain) and