Changeset 479 for trunk/Start.pas

Timestamp:

Dec 6, 2023, 5:28:20 PM (5 months ago)

Author:

chronos

Message:

• Fixed: Do not draw minimap outside of bitmap memory.
• Modified: Code cleanup.

File:

• trunk/Start.pas (modified) (5 diffs)

trunk/Start.pas

@@ -160 +160 @@
 const
   // predefined world size
-  // attention: lx*ly+1 must be prime!
-  { MaxWorldSize=8;
-    lxpre: array[0..nWorldSize-1] of Integer =(30,40,50,60,70,90,110,130);
-    lypre: array[0..nWorldSize-1] of Integer =(46,52,60,70,84,94,110,130);
-    DefaultWorldTiles=4200; }
+  // attention: lx * ly + 1 must be prime!
+  { MaxWorldSize = 8;
+    lxpre: array[0..nWorldSize - 1] of Integer = (30, 40, 50, 60, 70, 90, 110, 130);
+    lypre: array[0..nWorldSize - 1] of Integer = (46, 52, 60, 70, 84, 94, 110, 130);
+    DefaultWorldTiles = 4200; }
   MaxWorldSize = 6;
   WorldSizes: array [0 .. MaxWorldSize - 1] of TPoint = ((X: 30; Y: 46),
@@ -558 +558 @@
   MainAction: TMainAction;
 begin
-  PaintBackground(self, 3, 3, TabOffset + 4 * TabSize - 4, TabHeight - 3);
-  PaintBackground(self, 3, TabHeight + 3, ClientWidth - 6,
+  PaintBackground(Self, 3, 3, TabOffset + 4 * TabSize - 4, TabHeight - 3);
+  PaintBackground(Self, 3, TabHeight + 3, ClientWidth - 6,
     ClientHeight - TabHeight - 6);
   with Canvas do
@@ -570 +570 @@
   if Page in [pgStartRandom, pgStartMap] then
   begin
-    Frame(Canvas, 328, yMain + 112 - 15, ClientWidth, Up2Btn.top + 38,
+    Frame(Canvas, 328, yMain + 112 - 15, ClientWidth, Up2Btn.Top + 38,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
     if AutoDiff > 0 then
     begin
-      Frame(Canvas, -1 { x0Brain-dxBrain } ,
-        yMain + 112 - 15 { Up1Btn.Top-12 }{ y0Brain-dyBrain } ,
-        x0Brain + dxBrain + 64, Up2Btn.top + 38 { y0Brain+dyBrain+64 } ,
+      Frame(Canvas, -1 { x0Brain - dxBrain } ,
+        yMain + 112 - 15 { Up1Btn.Top - 12 }{ y0Brain - dyBrain } ,
+        x0Brain + dxBrain + 64, Up2Btn.Top + 38 { y0Brain + dyBrain + 64 } ,
         MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
     end;
   end
-  else if Page <> pgMain then
-    Frame(Canvas, 328, Up1Btn.top - 15, ClientWidth, Up2Btn.top + 38,
+  else if Page <> pgMain then begin
+    Frame(Canvas, 328, Up1Btn.Top - 15, ClientWidth, Up2Btn.Top + 38,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
+  end;
   Frame(Canvas, 0, 0, ClientWidth - 1, ClientHeight - 1, 0, 0);
 
@@ -1091 +1092 @@
     end;
     pgLoad: begin
-        MiniMap.LoadFromLogFile(GetSavedDir + DirectorySeparator +
-          List.Items[List.ItemIndex] + CevoExt, LastTurn, WorldSizes[DefaultWorldSize]);
-        // BookDate:=DateToStr(FileDateToDateTime(FileAge(FileName)));
-        if not TurnValid then  begin
-          LoadTurn := LastTurn;
-          SmartInvalidate(xTurnSlider - 2, y0Mini + 61,
-            xTurnSlider + wTurnSlider + 2, yTurnSlider + 9);
-        end;
-        TurnValid := True;
-      end;
+      MiniMap.LoadFromLogFile(GetSavedDir + DirectorySeparator +
+        List.Items[List.ItemIndex] + CevoExt, LastTurn, WorldSizes[DefaultWorldSize]);
+        // BookDate := DateToStr(FileDateToDateTime(FileAge(FileName)));
+      if not TurnValid then begin
+        LoadTurn := LastTurn;
+        SmartInvalidate(xTurnSlider - 2, y0Mini + 61,
+          xTurnSlider + wTurnSlider + 2, yTurnSlider + 9);
+      end;
+      TurnValid := True;
+    end;
     pgEditRandom: begin
       MapFileName := '';
@@ -1390 +1391 @@
             PlayerSlots[I].MultiBtn.Tag := 768;
             PlayerSlots[I].MultiBtn.ButtonIndex := 2 + (MultiControl shr I) and 1;
-            PlayerSlots[I].MultiBtn.Enabled := Page = pgStartRandom
+            PlayerSlots[I].MultiBtn.Enabled := Page = pgStartRandom;
           end
           else