Changeset 496

Timestamp:

Dec 18, 2023, 10:31:54 PM (4 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• GameServer.pas (modified) (5 diffs)
• LocalPlayer/Battle.pas (modified) (1 diff)
• LocalPlayer/Enhance.pas (modified) (3 diffs)
• LocalPlayer/Help.pas (modified) (2 diffs)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• LocalPlayer/Nego.pas (modified) (1 diff)
• LocalPlayer/Rates.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (10 diffs)
• LocalPlayer/TechTree.pas (modified) (4 diffs)
• LocalPlayer/Term.pas (modified) (26 diffs)
• MiniMap.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (2 diffs)
• Packages/CevoComponents/ButtonBase.pas (modified) (4 diffs)
• Packages/DpiControls/Dpi.Forms.pas (modified) (1 diff)
• Start.pas (modified) (11 diffs)

trunk/GameServer.pas

@@ -610 +610 @@
 procedure SaveGame(FileName: string; Auto: Boolean);
 var
-  X, Y, I, zero, Tile, nLocal: Integer;
+  X, Y, I, Zero, Tile, nLocal: Integer;
   LogFile: TFileStream;
   S: string[255];
@@ -637 +637 @@
       fmCreate or fmShareExclusive);
 
-  zero := 0;
+  Zero := 0;
   LogFile.Position := 0;
   S := 'cEvoBook';
@@ -662 +662 @@
   for I := 0 to nPl - 1 do
     if not Assigned(bix[I]) then
-      LogFile.Write(zero, 4)
+      LogFile.Write(Zero, 4)
     else
     begin
@@ -669 +669 @@
       else
         S := PlayersBrain[I].FileName;
-      Move(zero, S[Length(S) + 1], 4);
+      Move(Zero, S[Length(S) + 1], 4);
       LogFile.Write(S, (Length(S) div 4 + 1) * 4);
       LogFile.Write(OriginalDataVersion[I], 4);
       S := ''; { behavior }
-      Move(zero, S[Length(S) + 1], 4);
+      Move(Zero, S[Length(S) + 1], 4);
       LogFile.Write(S, (Length(S) div 4 + 1) * 4);
       LogFile.Write(Difficulty[I], 4);
@@ -687 +687 @@
     AutoSaveState := CL.State;
     AutoSaveExists := True;
-  end
+  end;
 end;
 

trunk/LocalPlayer/Battle.pas

@@ -239 +239 @@
     FillRect(Rect(0, 0, ClientWidth, ClientHeight));
     Brush.Style := TBrushStyle.bsClear;
-    PaintBackground(self, 3 + Border, 3 + Border,
+    PaintBackground(Self, 3 + Border, 3 + Border,
       ClientWidth - (6 + 2 * Border), ClientHeight - (6 + 2 * Border));
   end;

trunk/LocalPlayer/Enhance.pas

@@ -126 +126 @@
 procedure TEnhanceDlg.OffscreenPaint;
 var
-  I, stage, TerrType, TileImp, X, EndStage, Cost, LastJob: Integer;
+  I, Stage, TerrType, TileImp, X, EndStage, Cost, LastJob: Integer;
   S: string;
-  Done: set of jNone .. jTrans;
+  Done: set of jNone..jTrans;
   TypeChanged: Boolean;
 begin
-  OffscreenUser := self;
+  OffscreenUser := Self;
   Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
   FillOffscreen(0, 0, InnerWidth, InnerHeight);
@@ -145 +145 @@
   Done := [];
   Cost := 0;
-  for stage := 0 to EndStage do
+  for Stage := 0 to EndStage do
   begin
-    if stage > 0 then
+    if Stage > 0 then
     begin
       Sprite(Offscreen, HGrSystem, X - 10, 66, 14, 14, 80, 1);
-      case MyData.EnhancementJobs[Page, stage - 1] of
+      case MyData.EnhancementJobs[Page, Stage - 1] of
         jRoad:
           begin
@@ -192 +192 @@
           end;
       end;
-      Include(Done, MyData.EnhancementJobs[Page, stage - 1]);
+      Include(Done, MyData.EnhancementJobs[Page, Stage - 1]);
     end;
 

trunk/LocalPlayer/Help.pas

@@ -402 +402 @@
     BitBltCanvas(ACanvas, X, Y - 4, 24, 24, HGrSystem.Data.Canvas, 1,
       146);
-    BiColorTextOut(ACanvas, $FFFFFF, $7F007F, X + 10 - ACanvas.Textwidth(S[1]) div 2,
+    BiColorTextOut(ACanvas, $FFFFFF, $7F007F, X + 10 - ACanvas.TextWidth(S[1]) div 2,
       Y - 3, S[1]);
     BiColorTextOut(ACanvas, CaptionColor, $7F007F, X + 24, Y - 3, Copy(S, 2, 255));
@@ -578 +578 @@
               Font.Assign(UniFont[ftSmall]);
               BiColorTextOut(OffScreen.Canvas, $000000, $7F007F,
-                (InnerWidth - Textwidth(S)) div 2, I * 24 + 26, S);
+                (InnerWidth - TextWidth(S)) div 2, I * 24 + 26, S);
               Font.Assign(UniFont[ftNormal]);
             end;

trunk/LocalPlayer/NatStat.pas

@@ -498 +498 @@
       pView := Me;
     Tag := pView;
-    PlayerClick(self); // no, this is not nice
+    PlayerClick(Self); // no, this is not nice
   end
   else

trunk/LocalPlayer/Nego.pas

@@ -485 +485 @@
   OkEnabled: Boolean;
 begin
-  if (OffscreenUser <> nil) and (OffscreenUser <> self) then
+  if (OffscreenUser <> nil) and (OffscreenUser <> Self) then
     OffscreenUser.Update;
   // complete working with old owner to prevent rebound
-  OffscreenUser := self;
+  OffscreenUser := Self;
 
   if (DipCommand >= 0) and (Page = History[Me].N) then

trunk/LocalPlayer/Rates.pas

@@ -48 +48 @@
   S, s1: string;
 begin
-  if (OffscreenUser <> nil) and (OffscreenUser <> self) then
+  if (OffscreenUser <> nil) and (OffscreenUser <> Self) then
     OffscreenUser.Update;
   // complete working with old owner to prevent rebound
-  OffscreenUser := self;
+  OffscreenUser := Self;
 
   Fill(Offscreen.Canvas, 0, 0, ClientWidth, ClientHeight,

trunk/LocalPlayer/Select.pas

@@ -986 +986 @@
 procedure TListDlg.InitLines;
 var
-  required: array [0 .. nAdv - 1] of Integer;
+  Required: array [0 .. nAdv - 1] of Integer;
 
   procedure TryAddImpLine(Layer, Project: Integer);
@@ -1000 +1000 @@
   procedure SortTechs;
   var
-    I, J, swap: Integer;
+    I, J, Swap: Integer;
   begin // sort by advancedness
     for I := 0 to Lines[0] - 2 do
@@ -1008 +1008 @@
             nAdv + Code[0, J] then
           begin
-            swap := Code[0, I];
+            Swap := Code[0, I];
             Code[0, I] := Code[0, J];
-            Code[0, J] := swap;
+            Code[0, J] := Swap;
           end;
   end;
@@ -1016 +1016 @@
   procedure SortCities;
   var
-    I, J, swap: Integer;
+    I, J, Swap: Integer;
   begin
     for I := 0 to Lines[0] - 2 do
@@ -1023 +1023 @@
         then
         begin
-          swap := Code[0, I];
+          Swap := Code[0, I];
           Code[0, I] := Code[0, J];
-          Code[0, J] := swap;
+          Code[0, J] := Swap;
         end;
   end;
@@ -1039 +1039 @@
   procedure SortModels;
   var
-    I, J, swap: Integer;
+    I, J, Swap: Integer;
   begin // sort by code[2]
     for I := 0 to Lines[0] - 2 do
@@ -1045 +1045 @@
         if Code[2, I] > Code[2, J] then
         begin
-          swap := Code[0, I];
+          Swap := Code[0, I];
           Code[0, I] := Code[0, J];
-          Code[0, J] := swap;
-          swap := Code[1, I];
+          Code[0, J] := Swap;
+          Swap := Code[1, I];
           Code[1, I] := Code[1, J];
-          Code[1, J] := swap;
-          swap := Code[2, I];
+          Code[1, J] := Swap;
+          Swap := Code[2, I];
           Code[2, I] := Code[2, J];
-          Code[2, J] := swap;
+          Code[2, J] := Swap;
         end;
   end;
@@ -1059 +1059 @@
   procedure MarkPreqs(I: Integer);
   begin
-    required[I] := 1;
+    Required[I] := 1;
     if MyRO.Tech[I] < tsSeen then
     begin
@@ -1147 +1147 @@
         if MyData.FarTech <> adNone then
         begin
-          FillChar(required, SizeOf(required), 0);
+          FillChar(Required, SizeOf(Required), 0);
           MarkPreqs(MyData.FarTech);
         end;
@@ -1153 +1153 @@
           if ((I in FutureTech) or (MyRO.Tech[I] < tsApplicable)) and
             (Server(sSetResearch - sExecute, Me, I, nil^) >= rExecuted) and
-            ((MyData.FarTech = adNone) or (required[I] > 0)) then
+            ((MyData.FarTech = adNone) or (Required[I] > 0)) then
           begin
             Code[0, Lines[0]] := I;

trunk/LocalPlayer/TechTree.pas

@@ -99 +99 @@
         ClientHeight - BlackBorder, -BlackBorder - xOffset,
         -BlackBorder - yOffset, Paper);
-    if xOffset + Image.width < ClientWidth - 2 * BlackBorder then
-      FillRectSeamless(Canvas, BlackBorder + xOffset + Image.width, BlackBorder,
+    if xOffset + Image.Width < ClientWidth - 2 * BlackBorder then
+      FillRectSeamless(Canvas, BlackBorder + xOffset + Image.Width, BlackBorder,
         ClientWidth - BlackBorder, ClientHeight - BlackBorder,
         -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
     X := Max(BlackBorder, BlackBorder + xOffset);
-    W := Min(BlackBorder + xOffset + Image.width, ClientWidth - BlackBorder);
+    W := Min(BlackBorder + xOffset + Image.Width, ClientWidth - BlackBorder);
     if yOffset > 0 then
       FillRectSeamless(Canvas, X, BlackBorder, W, BlackBorder + yOffset,
         -BlackBorder - xOffset, -BlackBorder - yOffset, Paper);
-    if yOffset + Image.height < ClientHeight - 2 * BlackBorder then
-      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.height, W,
+    if yOffset + Image.Height < ClientHeight - 2 * BlackBorder then
+      FillRectSeamless(Canvas, X, BlackBorder + yOffset + Image.Height, W,
         ClientHeight - BlackBorder, -BlackBorder - xOffset,
         -BlackBorder - yOffset, Paper);
@@ -115 +115 @@
   BitBltCanvas(Canvas, Max(BlackBorder, BlackBorder + xOffset),
     Max(BlackBorder, BlackBorder + yOffset),
-    Min(Image.width, Min(Image.width + xOffset,
+    Min(Image.Width, Min(Image.Width + xOffset,
     Min(ClientWidth - 2 * BlackBorder, ClientWidth - 2 * BlackBorder - xOffset))
-    ), Min(Image.height, Min(Image.height + yOffset,
+    ), Min(Image.Height, Min(Image.Height + yOffset,
     Min(ClientHeight - 2 * BlackBorder, ClientHeight - 2 * BlackBorder -
     yOffset))), Image.Canvas, Max(0, -xOffset),
@@ -177 +177 @@
     (Screen.Height - NewHeight) div 2,
     NewWidth, NewHeight);
-  CloseBtn.Left := width - CloseBtn.width - BlackBorder - 8;
+  CloseBtn.Left := Width - CloseBtn.Width - BlackBorder - 8;
   CloseBtn.Top := BlackBorder + 8;
   xOffset := (ClientWidth - Image.Width + LeftBorder - RightBorder) div 2 -
@@ -213 +213 @@
     if xOffset > LeftBorder then
       xOffset := LeftBorder;
-    if xOffset < ClientWidth - 2 * BlackBorder - Image.width - RightBorder then
-      xOffset := ClientWidth - 2 * BlackBorder - Image.width - RightBorder;
+    if xOffset < ClientWidth - 2 * BlackBorder - Image.Width - RightBorder then
+      xOffset := ClientWidth - 2 * BlackBorder - Image.Width - RightBorder;
     if yOffset > TopBorder then
       yOffset := TopBorder;
-    if yOffset < ClientHeight - 2 * BlackBorder - Image.height - BottomBorder
+    if yOffset < ClientHeight - 2 * BlackBorder - Image.Height - BottomBorder
     then
-      yOffset := ClientHeight - 2 * BlackBorder - Image.height - BottomBorder;
+      yOffset := ClientHeight - 2 * BlackBorder - Image.Height - BottomBorder;
 
     SmartInvalidate;

trunk/LocalPlayer/Term.pas

@@ -389 +389 @@
     procedure PaintLoc_BeforeMove(FromLoc: Integer);
     procedure PaintLocTemp(Loc: Integer; Style: TPaintLocTempStyle = pltsNormal);
-    procedure PaintBufferToScreen(xMap, yMap, width, height: Integer);
+    procedure PaintBufferToScreen(xMap, yMap, Width, Height: Integer);
     procedure PaintDestination;
     procedure SetUnFocus(uix: Integer);
@@ -652 +652 @@
   lxmax_xxx = 130;
   LeftPanelWidth = 70;
-  overlap = PanelHeight - MidPanelHeight;
+  Overlap = PanelHeight - MidPanelHeight;
   yTroop = PanelHeight - 83;
   xPalace = 66;
@@ -1790 +1790 @@
     begin
       Brush.Color := $000000;
-      FillRect(Rect(0, 0, Panel.width, Panel.height));
+      FillRect(Rect(0, 0, Panel.Width, Panel.Height));
       Brush.Style := TBrushStyle.bsClear;
     end;
@@ -1796 +1796 @@
     begin
       Brush.Color := $000000;
-      FillRect(Rect(0, 0, TopBar.width, TopBar.height));
+      FillRect(Rect(0, 0, TopBar.Width, TopBar.Height));
       Brush.Style := TBrushStyle.bsClear;
     end;
@@ -2806 +2806 @@
         begin
           Brush.Color := $000000;
-          FillRect(Rect(0, 0, Panel.width, Panel.height));
+          FillRect(Rect(0, 0, Panel.Width, Panel.Height));
           Brush.Style := TBrushStyle.bsClear;
         end;
@@ -2812 +2812 @@
         begin
           Brush.Color := $000000;
-          FillRect(Rect(0, 0, TopBar.width, TopBar.height));
+          FillRect(Rect(0, 0, TopBar.Width, TopBar.Height));
           Brush.Style := TBrushStyle.bsClear;
         end;
@@ -3565 +3565 @@
   Buffer := TBitmap.Create;
   Buffer.PixelFormat := TPixelFormat.pf24bit;
-  if 2 * lxmax > 3 * xSizeBig then Buffer.width := 2 * lxmax
-    else Buffer.width := 3 * xSizeBig;
-  if lymax > 3 * ySizeBig then Buffer.height := lymax
-    else Buffer.height := 3 * ySizeBig;
+  if 2 * lxmax > 3 * xSizeBig then Buffer.Width := 2 * lxmax
+    else Buffer.Width := 3 * xSizeBig;
+  if lymax > 3 * ySizeBig then Buffer.Height := lymax
+    else Buffer.Height := 3 * ySizeBig;
   Buffer.Canvas.Font.Assign(UniFont[ftSmall]);
   for I := 0 to nPl - 1 do
@@ -4208 +4208 @@
       MapOffset := (ClientWidth - MapWidth) div 2;
     end;
-    MapHeight := ClientHeight - TopBarHeight - PanelHeight + overlap;
+    MapHeight := ClientHeight - TopBarHeight - PanelHeight + Overlap;
     Panel.SetSize(ClientWidth, PanelHeight);
     TopBar.SetSize(ClientWidth, TopBarHeight);
@@ -4268 +4268 @@
   ResearchArea.Left := ClientWidth div 2;
   ManagementArea.Left := ClientWidth - xPalace;
-  ManagementArea.Top := TopBarHeight + MapHeight - overlap + yPalace;
+  ManagementArea.Top := TopBarHeight + MapHeight - Overlap + yPalace;
   ArrangeMidPanel;
   if RepaintOnResize then
@@ -4648 +4648 @@
 // panel protusions are added
 // NoMap must be set to buffer and bounds before
-procedure TMainScreen.PaintBufferToScreen(xMap, yMap, width, height: Integer);
-begin
-  if xMap + width > MapWidth then
-    width := MapWidth - xMap;
-  if yMap + height > MapHeight then
-    height := MapHeight - yMap;
-  if (width <= 0) or (height <= 0) or (width + xMap <= 0) or (height + yMap <= 0)
+procedure TMainScreen.PaintBufferToScreen(xMap, yMap, Width, Height: Integer);
+begin
+  if xMap + Width > MapWidth then
+    Width := MapWidth - xMap;
+  if yMap + Height > MapHeight then
+    Height := MapHeight - yMap;
+  if (Width <= 0) or (Height <= 0) or (Width + xMap <= 0) or (Height + yMap <= 0)
   then
     Exit;
 
-  NoMap.BitBltBitmap(Panel, -xMap - MapOffset, -yMap + MapHeight - overlap, xMidPanel,
-    overlap, 0, 0, SRCCOPY);
+  NoMap.BitBltBitmap(Panel, -xMap - MapOffset, -yMap + MapHeight - Overlap, xMidPanel,
+    Overlap, 0, 0, SRCCOPY);
   NoMap.BitBltBitmap(Panel, -xMap - MapOffset + xRightPanel,
-    -yMap + MapHeight - overlap, Panel.width - xRightPanel, overlap,
+    -yMap + MapHeight - Overlap, Panel.Width - xRightPanel, Overlap,
     xRightPanel, 0, SRCCOPY);
   if yMap < 0 then
   begin
     if xMap < 0 then
-      BitBltCanvas(Canvas, MapOffset, TopBarHeight, width + xMap,
-        height + yMap, Buffer.Canvas, -xMap, -yMap)
+      BitBltCanvas(Canvas, MapOffset, TopBarHeight, Width + xMap,
+        Height + yMap, Buffer.Canvas, -xMap, -yMap)
     else
-      BitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight, width,
-        height + yMap, Buffer.Canvas, 0, -yMap);
+      BitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight, Width,
+        Height + yMap, Buffer.Canvas, 0, -yMap);
   end
   else
   begin
     if xMap < 0 then
-      BitBltCanvas(Canvas, MapOffset, TopBarHeight + yMap, width + xMap,
-        height, Buffer.Canvas, -xMap, 0)
+      BitBltCanvas(Canvas, MapOffset, TopBarHeight + yMap, Width + xMap,
+        Height, Buffer.Canvas, -xMap, 0)
     else
-      BitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, width,
-        height, Buffer.Canvas, 0, 0);
+      BitBltCanvas(Canvas, xMap + MapOffset, TopBarHeight + yMap, Width,
+        Height, Buffer.Canvas, 0, 0);
   end;
 end;
@@ -4729 +4729 @@
       FillRect(Rect(0, 0, MapWidth, MapHeight));
       Brush.Style := TBrushStyle.bsClear;
-      OffscreenUser := self;
+      OffscreenUser := Self;
       Exit;
     end;
 
   MainMap.SetPaintBounds(0, 0, MapWidth, MapHeight);
-  if OffscreenUser <> self then
+  if OffscreenUser <> Self then
   begin
     if OffscreenUser <> nil then
@@ -4772 +4772 @@
       for DoInvalidate := False to FastScrolling do begin
         if DoInvalidate then begin
-          rec.Bottom := MapHeight - overlap;
+          rec.Bottom := MapHeight - Overlap;
 {$IFDEF WINDOWS}
           ScrollDC(Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt, rec,
@@ -4795 +4795 @@
         else if yw > ywd then begin
           if DoInvalidate then
-            RectInvalidate(MapOffset, TopBarHeight + MapHeight - overlap -
+            RectInvalidate(MapOffset, TopBarHeight + MapHeight - Overlap -
               (yw - ywd) * yyt, MapOffset + MapWidth, TopBarHeight + MapHeight
-              - overlap)
+              - Overlap)
           else
             ProcessRect(xw, (ywd + MapHeight div (yyt * 2) * 2), MapWidth div xxt,
@@ -4818 +4818 @@
       if not FastScrolling then
         RectInvalidate(MapOffset, TopBarHeight, MapOffset + MapWidth,
-          TopBarHeight + MapHeight - overlap);
-      RectInvalidate(xMidPanel, TopBarHeight + MapHeight - overlap, xRightPanel,
+          TopBarHeight + MapHeight - Overlap);
+      RectInvalidate(xMidPanel, TopBarHeight + MapHeight - Overlap, xRightPanel,
         TopBarHeight + MapHeight);
     end;
@@ -4852 +4852 @@
   MiniMapPaint;
   CopyMiniToPanel;
-  RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
-    xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini +
+  RectInvalidate(xMini + 2, TopBarHeight + MapHeight - Overlap + yMini + 2,
+    xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - Overlap + yMini +
     2 + G.ly);
 end;
@@ -4908 +4908 @@
     Fill(Panel.Canvas, 0, 3, xMidPanel + 7 - 10, PanelHeight - 3,
       MainTexture.Width - (xMidPanel + 7 - 10), MainTexture.Height - PanelHeight);
-    Fill(Panel.Canvas, xRightPanel + 10 - 7, 3, Panel.width - xRightPanel - 10 +
+    Fill(Panel.Canvas, xRightPanel + 10 - 7, 3, Panel.Width - xRightPanel - 10 +
       7, PanelHeight - 3, -(xRightPanel + 10 - 7), MainTexture.Height - PanelHeight);
     FillLarge(Panel.Canvas, xMidPanel - 2, PanelHeight - MidPanelHeight,
@@ -5337 +5337 @@
       if TerrainBtn.Visible then
         with TerrainBtn do
-          RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
-            (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
+          RFrame(Panel.Canvas, Left - 1, Top - Self.ClientHeight +
+            (PanelHeight - 1), Left + Width, Top + Height - Self.ClientHeight +
             PanelHeight, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight)
     end; { if TroopLoc>=0 }
@@ -5349 +5349 @@
         if Visible then
         begin
-          Dump(Panel, HGrSystem, Left, Top - self.ClientHeight + PanelHeight,
+          Dump(Panel, HGrSystem, Left, Top - Self.ClientHeight + PanelHeight,
             25, 25, 169, 243);
-          Sprite(Panel, HGrSystem, Left, Top - self.ClientHeight + PanelHeight,
+          Sprite(Panel, HGrSystem, Left, Top - Self.ClientHeight + PanelHeight,
             25, 25, 1 + 26 * ButtonIndex, 337);
-          RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
-            (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
+          RFrame(Panel.Canvas, Left - 1, Top - Self.ClientHeight +
+            (PanelHeight - 1), Left + Width, Top + Height - Self.ClientHeight +
             PanelHeight, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
         end;
@@ -5365 +5365 @@
         with TButtonC(Controls[I]) do
         begin
-          Dump(Panel, HGrSystem, Left, Top - self.ClientHeight + PanelHeight,
+          Dump(Panel, HGrSystem, Left, Top - Self.ClientHeight + PanelHeight,
             12, 12, 169, 178 + 13 * ButtonIndex);
-          RFrame(Panel.Canvas, Left - 1, Top - self.ClientHeight +
-            (PanelHeight - 1), Left + width, Top + height - self.ClientHeight +
+          RFrame(Panel.Canvas, Left - 1, Top - Self.ClientHeight +
+            (PanelHeight - 1), Left + Width, Top + Height - Self.ClientHeight +
             PanelHeight, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
         end;
@@ -5620 +5620 @@
   MiniMapPaint;
   CopyMiniToPanel;
-  RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
-    xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini +
+  RectInvalidate(xMini + 2, TopBarHeight + MapHeight - Overlap + yMini + 2,
+    xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - Overlap + yMini +
     2 + G.ly);
   Update;
@@ -5846 +5846 @@
             MainTexture.ColorMark);
       end;
-      RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
-        xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini
+      RectInvalidate(xMini + 2, TopBarHeight + MapHeight - Overlap + yMini + 2,
+        xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - Overlap + yMini
         + 2 + G.ly);
     end
@@ -6029 +6029 @@
       BattleDlg.uix := UnFocus;
       BattleDlg.ToLoc := MouseLoc;
-      BattleDlg.Left := X - BattleDlg.width div 2;
+      BattleDlg.Left := X - BattleDlg.Width div 2;
       if BattleDlg.Left < 0 then
         BattleDlg.Left := 0
-      else if BattleDlg.Left + BattleDlg.width > Screen.width then
-        BattleDlg.Left := Screen.width - BattleDlg.width;
-      BattleDlg.Top := Y - BattleDlg.height div 2;
+      else if BattleDlg.Left + BattleDlg.Width > Screen.Width then
+        BattleDlg.Left := Screen.Width - BattleDlg.Width;
+      BattleDlg.Top := Y - BattleDlg.Height div 2;
       if BattleDlg.Top < 0 then
         BattleDlg.Top := 0
-      else if BattleDlg.Top + BattleDlg.height > Screen.height then
-        BattleDlg.Top := Screen.height - BattleDlg.height;
+      else if BattleDlg.Top + BattleDlg.Height > Screen.Height then
+        BattleDlg.Top := Screen.Height - BattleDlg.Height;
       BattleDlg.IsSuicideQuery := False;
       BattleDlg.Show;
@@ -7841 +7841 @@
         Buffer.Canvas, 0, 0);
       MainOffscreenPaint;
-      RectInvalidate(xMini + 2, TopBarHeight + MapHeight - overlap + yMini + 2,
-        xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - overlap + yMini +
+      RectInvalidate(xMini + 2, TopBarHeight + MapHeight - Overlap + yMini + 2,
+        xMini + 2 + G.lx * 2, TopBarHeight + MapHeight - Overlap + yMini +
         2 + G.ly);
       Update;
@@ -7970 +7970 @@
       if xMidPanel > MapOffset then
         FillRect(Rect(0, TopBarHeight, MapOffset, TopBarHeight + MapHeight
-          - overlap))
+          - Overlap))
       else
       begin
         FillRect(Rect(0, TopBarHeight, xMidPanel, TopBarHeight + MapHeight -
-          overlap));
+          Overlap));
         FillRect(Rect(xMidPanel, TopBarHeight, MapOffset,
           TopBarHeight + MapHeight));
@@ -7980 +7980 @@
       if xRightPanel < MapOffset + MapWidth then
         FillRect(Rect(MapOffset + MapWidth, TopBarHeight, ClientWidth,
-          TopBarHeight + MapHeight - overlap))
+          TopBarHeight + MapHeight - Overlap))
       else
       begin
@@ -7986 +7986 @@
           TopBarHeight + MapHeight));
         FillRect(Rect(xRightPanel, TopBarHeight, ClientWidth,
-          TopBarHeight + MapHeight - overlap));
+          TopBarHeight + MapHeight - Overlap));
       end;
       Brush.Style := TBrushStyle.bsClear;
     end;
-  BitBltCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - overlap,
+  BitBltCanvas(Canvas, MapOffset, TopBarHeight, MapWidth, MapHeight - Overlap,
     Offscreen.Canvas, 0, 0);
   BitBltCanvas(Canvas, 0, 0, ClientWidth, TopBarHeight, TopBar.Canvas,
     0, 0);
   if xMidPanel > MapOffset then
-    BitBltCanvas(Canvas, xMidPanel, TopBarHeight + MapHeight - overlap,
-      ClientWidth div 2 - xMidPanel, overlap, Offscreen.Canvas,
-      xMidPanel - MapOffset, MapHeight - overlap)
+    BitBltCanvas(Canvas, xMidPanel, TopBarHeight + MapHeight - Overlap,
+      ClientWidth div 2 - xMidPanel, Overlap, Offscreen.Canvas,
+      xMidPanel - MapOffset, MapHeight - Overlap)
   else
-    BitBltCanvas(Canvas, MapOffset, TopBarHeight + MapHeight - overlap,
-      ClientWidth div 2 - MapOffset, overlap, Offscreen.Canvas, 0,
-      MapHeight - overlap);
+    BitBltCanvas(Canvas, MapOffset, TopBarHeight + MapHeight - Overlap,
+      ClientWidth div 2 - MapOffset, Overlap, Offscreen.Canvas, 0,
+      MapHeight - Overlap);
   if xRightPanel < MapOffset + MapWidth then
-    BitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
-      xRightPanel - ClientWidth div 2, overlap, Offscreen.Canvas,
-      ClientWidth div 2 - MapOffset, MapHeight - overlap)
+    BitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - Overlap,
+      xRightPanel - ClientWidth div 2, Overlap, Offscreen.Canvas,
+      ClientWidth div 2 - MapOffset, MapHeight - Overlap)
   else
-    BitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - overlap,
-      MapOffset + MapWidth - ClientWidth div 2, overlap,
+    BitBltCanvas(Canvas, ClientWidth div 2, TopBarHeight + MapHeight - Overlap,
+      MapOffset + MapWidth - ClientWidth div 2, Overlap,
       Offscreen.Canvas, ClientWidth div 2 - MapOffset,
-      MapHeight - overlap);
-  BitBltCanvas(Canvas, 0, TopBarHeight + MapHeight - overlap, xMidPanel,
-    overlap, Panel.Canvas, 0, 0);
-  BitBltCanvas(Canvas, xRightPanel, TopBarHeight + MapHeight - overlap,
-    Panel.width - xRightPanel, overlap, Panel.Canvas, xRightPanel, 0);
-  BitBltCanvas(Canvas, 0, TopBarHeight + MapHeight, Panel.width,
-    PanelHeight - overlap, Panel.Canvas, 0, overlap);
+      MapHeight - Overlap);
+  BitBltCanvas(Canvas, 0, TopBarHeight + MapHeight - Overlap, xMidPanel,
+    Overlap, Panel.Canvas, 0, 0);
+  BitBltCanvas(Canvas, xRightPanel, TopBarHeight + MapHeight - Overlap,
+    Panel.Width - xRightPanel, Overlap, Panel.Canvas, xRightPanel, 0);
+  BitBltCanvas(Canvas, 0, TopBarHeight + MapHeight, Panel.Width,
+    PanelHeight - Overlap, Panel.Canvas, 0, Overlap);
   if (pLogo >= 0) and (G.RO[pLogo] = nil) and (AILogo[pLogo] <> nil) then
     BitBltCanvas(Canvas, xRightPanel + 10 - (16 + 64),

trunk/MiniMap.pas

@@ -121 +121 @@
   if LoadGraphicFile(Bitmap, ImageFileName, [gfNoError]) then
   begin
-    if Bitmap.width div 2 > MaxWidthMapLogo then
-      Bitmap.width := MaxWidthMapLogo * 2;
-    if Bitmap.height > MaxHeightMapLogo then
-      Bitmap.height := MaxHeightMapLogo;
-    Size.X := Bitmap.width div 2;
-    Size.Y := Bitmap.height;
+    if Bitmap.Width div 2 > MaxWidthMapLogo then
+      Bitmap.Width := MaxWidthMapLogo * 2;
+    if Bitmap.Height > MaxHeightMapLogo then
+      Bitmap.Height := MaxHeightMapLogo;
+    Size.X := Bitmap.Width div 2;
+    Size.Y := Bitmap.Height;
   end else begin
     Mode := mmNone;

trunk/Packages/CevoComponents/BaseWin.pas

@@ -175 +175 @@
     Assert((NewMode = wmModal) or (FWindowMode <> wmModal));
     // don't make modal window non-modal
-    if (NewMode = wmModal) and (forceclose or (FWindowMode <> wmModal)) then
+    if (NewMode = wmModal) and (ForceClose or (FWindowMode <> wmModal)) then
     begin // make modal
       UserLeft := Left;
@@ -183 +183 @@
       ShowModal;
     end
-    else if forceclose then
+    else if ForceClose then
     begin // make modal
       Visible := False;

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -84 +84 @@
       Invalidate;
       if @DownChangedProc <> nil then
-        DownChangedProc(self);
+        DownChangedProc(Self);
     end;
     if (Button = TMouseButton.mbLeft) and (@ClickProc <> nil) then
-      ClickProc(self);
+      ClickProc(Self);
   end
   else
@@ -98 +98 @@
       Invalidate;
       if @DownChangedProc <> nil then
-        DownChangedProc(self);
+        DownChangedProc(Self);
     end;
   end;
@@ -113 +113 @@
         Paint;
         if @DownChangedProc <> nil then
-          DownChangedProc(self);
+          DownChangedProc(Self);
       end
       else
@@ -122 +122 @@
       Paint;
       if @DownChangedProc <> nil then
-        DownChangedProc(self);
+        DownChangedProc(Self);
     end;
 end;

trunk/Packages/DpiControls/Dpi.Forms.pas

@@ -14 +14 @@
   TMessageEvent = procedure (var TheMessage : TLMessage) of object;
   TCloseAction = Forms.TCloseAction;
+  TFormState = Forms.TFormState;
   TFormStateType = Forms.TFormStateType;
   TWindowState = Forms.TWindowState;

trunk/Start.pas

@@ -264 +264 @@
   for I := 0 to PlayerSlots.Count - 1 do
   with PlayerSlots[I] do begin
-    DiffUpBtn := TButtonC.Create(self);
+    DiffUpBtn := TButtonC.Create(Self);
     DiffUpBtn.Graphic := HGrSystem.Data;
-    DiffUpBtn.left := xBrain[I] - 18;
-    DiffUpBtn.top := yBrain[I] + 39;
+    DiffUpBtn.Left := xBrain[I] - 18;
+    DiffUpBtn.Top := yBrain[I] + 39;
     DiffUpBtn.ButtonIndex := 1;
-    DiffUpBtn.Parent := self;
+    DiffUpBtn.Parent := Self;
     DiffUpBtn.OnClick := DiffBtnClick;
-    DiffDownBtn := TButtonC.Create(self);
+    DiffDownBtn := TButtonC.Create(Self);
     DiffDownBtn.Graphic := HGrSystem.Data;
-    DiffDownBtn.left := xBrain[I] - 18;
-    DiffDownBtn.top := yBrain[I] + 51;
+    DiffDownBtn.Left := xBrain[I] - 18;
+    DiffDownBtn.Top := yBrain[I] + 51;
     DiffDownBtn.ButtonIndex := 0;
-    DiffDownBtn.Parent := self;
+    DiffDownBtn.Parent := Self;
     DiffDownBtn.OnClick := DiffBtnClick;
   end;
   for I := 6 to 8 do
   with PlayerSlots[I] do begin
-    MultiBtn := TButtonC.Create(self);
+    MultiBtn := TButtonC.Create(Self);
     MultiBtn.Graphic := HGrSystem.Data;
-    MultiBtn.left := xBrain[I] - 18;
-    MultiBtn.top := yBrain[I];
-    MultiBtn.Parent := self;
+    MultiBtn.Left := xBrain[I] - 18;
+    MultiBtn.Top := yBrain[I];
+    MultiBtn.Parent := Self;
     MultiBtn.OnClick := MultiBtnClick;
     OfferMultiple := True;
@@ -291 +291 @@
 
   X := BiColorTextWidth(Canvas, Phrases.Lookup('STARTCONTROLS', 7)) div 2;
-  CustomizeBtn.left := x0Brain + 32 - 16 - X;
+  CustomizeBtn.Left := x0Brain + 32 - 16 - X;
   if AutoDiff < 0 then
     CustomizeBtn.ButtonIndex := 3
@@ -352 +352 @@
     begin
       with Controls[I].BoundsRect do
-        r1 := CreateRectRgn(left, top, Right, Bottom);
+        r1 := CreateRectRgn(Left, Top, Right, Bottom);
       CombineRgn(r0, r0, r1, RGN_DIFF);
       DeleteObject(r1);
@@ -619 +619 @@
   if Tab = tbMain then
   begin
-    PaintBackground(self, 3, TabHeight - 1, TabSize - 4 - 3 + TabOffset + 3, 4);
+    PaintBackground(Self, 3, TabHeight - 1, TabSize - 4 - 3 + TabOffset + 3, 4);
     Canvas.Pixels[2, TabHeight] := MainTexture.ColorBevelLight;
   end
   else
   begin
-    PaintBackground(self, TabOffset + 3 + Integer(Tab) * TabSize, TabHeight - 1,
+    PaintBackground(Self, TabOffset + 3 + Integer(Tab) * TabSize, TabHeight - 1,
       TabSize - 4, 4);
     Canvas.Pixels[TabOffset + Integer(Tab) * TabSize + 2, TabHeight] :=
@@ -738 +738 @@
             Frame(Canvas, xBrain[I] - 19, yBrain[I] + 18, xBrain[I] - 18 + 12,
               yBrain[I] + (19 + 14), $000000, $000000);
-            RFrame(Canvas, PlayerSlots[I].DiffUpBtn.left - 1, PlayerSlots[I].DiffUpBtn.top - 1,
-              PlayerSlots[I].DiffUpBtn.left + 12, PlayerSlots[I].DiffUpBtn.top + 24,
+            RFrame(Canvas, PlayerSlots[I].DiffUpBtn.Left - 1, PlayerSlots[I].DiffUpBtn.Top - 1,
+              PlayerSlots[I].DiffUpBtn.Left + 12, PlayerSlots[I].DiffUpBtn.Top + 24,
               MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
             with Canvas do
@@ -750 +750 @@
             if PlayerSlots[I].OfferMultiple then
             begin
-              RFrame(Canvas, PlayerSlots[I].MultiBtn.left - 1, PlayerSlots[I].MultiBtn.top - 1,
-                PlayerSlots[I].MultiBtn.left + 12, PlayerSlots[I].MultiBtn.top + 12,
+              RFrame(Canvas, PlayerSlots[I].MultiBtn.Left - 1, PlayerSlots[I].MultiBtn.Top - 1,
+                PlayerSlots[I].MultiBtn.Left + 12, PlayerSlots[I].MultiBtn.Top + 12,
                 MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
               BitBltCanvas(Canvas, xBrain[I] - 31, yBrain[I], 13, 12,
@@ -850 +850 @@
     BtnFrame(Canvas, StartBtn.BoundsRect, MainTexture);
   if Up2Btn.Visible then
-    RFrame(Canvas, Up2Btn.left - 1, Up2Btn.top - 1, Up2Btn.left + 12,
-      Up2Btn.top + 24, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
+    RFrame(Canvas, Up2Btn.Left - 1, Up2Btn.Top - 1, Up2Btn.Left + 12,
+      Up2Btn.Top + 24, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
   if Up1Btn.Visible then
-    RFrame(Canvas, Up1Btn.left - 1, Up1Btn.top - 1, Up1Btn.left + 12,
-      Up1Btn.top + 24, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
+    RFrame(Canvas, Up1Btn.Left - 1, Up1Btn.Top - 1, Up1Btn.Left + 12,
+      Up1Btn.Top + 24, MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
   if AutoDiffUpBtn.Visible then
-    RFrame(Canvas, AutoDiffUpBtn.left - 1, AutoDiffUpBtn.top - 1,
-      AutoDiffUpBtn.left + 12, AutoDiffUpBtn.top + 24, MainTexture.ColorBevelShade,
+    RFrame(Canvas, AutoDiffUpBtn.Left - 1, AutoDiffUpBtn.Top - 1,
+      AutoDiffUpBtn.Left + 12, AutoDiffUpBtn.Top + 24, MainTexture.ColorBevelShade,
       MainTexture.ColorBevelLight);
   if AutoEnemyUpBtn.Visible then
-    RFrame(Canvas, AutoEnemyUpBtn.left - 1, AutoEnemyUpBtn.top - 1,
-      AutoEnemyUpBtn.left + 12, AutoEnemyUpBtn.top + 24,
+    RFrame(Canvas, AutoEnemyUpBtn.Left - 1, AutoEnemyUpBtn.Top - 1,
+      AutoEnemyUpBtn.Left + 12, AutoEnemyUpBtn.Top + 24,
       MainTexture.ColorBevelShade, MainTexture.ColorBevelLight);
   if CustomizeBtn.Visible then
-    RFrame(Canvas, CustomizeBtn.left - 1, CustomizeBtn.top - 1,
-      CustomizeBtn.left + 12, CustomizeBtn.top + 12, MainTexture.ColorBevelShade,
+    RFrame(Canvas, CustomizeBtn.Left - 1, CustomizeBtn.Top - 1,
+      CustomizeBtn.Left + 12, CustomizeBtn.Top + 12, MainTexture.ColorBevelShade,
       MainTexture.ColorBevelLight);
   if List.Visible then
@@ -1176 +1176 @@
             end;
             SmartInvalidate(xBrain[I] - 31, yBrain[I] - 1, xBrain[I] + 64,
-              PlayerSlots[I].DiffUpBtn.top + 25);
+              PlayerSlots[I].DiffUpBtn.Top + 25);
           end;
         BrainTerm.Flags := BrainTerm.Flags and not fUsed;
@@ -1182 +1182 @@
     end;
     SmartInvalidate(xBrain[PlayerPopupIndex] - 31, yBrain[PlayerPopupIndex] - 1,
-      xBrain[PlayerPopupIndex] + 64, PlayerSlots[PlayerPopupIndex].DiffUpBtn.top + 25);
+      xBrain[PlayerPopupIndex] + 64, PlayerSlots[PlayerPopupIndex].DiffUpBtn.Top + 25);
   end;
 end;
@@ -1507 +1507 @@
         InitPopup(I);
         if yBrain[I] > y0Brain then
-          PopupMenu1.Popup(left + xBrain[I] + 4, top + yBrain[I] + 60)
+          PopupMenu1.Popup(Left + xBrain[I] + 4, Top + yBrain[I] + 60)
         else
-          PopupMenu1.Popup(left + xBrain[I] + 4, top + yBrain[I] + 4);
+          PopupMenu1.Popup(Left + xBrain[I] + 4, Top + yBrain[I] + 4);
       end;
   end
@@ -1520 +1520 @@
     begin
       InitPopup(-1);
-      PopupMenu1.Popup(left + xDefault + 4, top + yDefault + 4);
+      PopupMenu1.Popup(Left + xDefault + 4, Top + yDefault + 4);
     end
   else if (Page = pgLoad) and (LastTurn > 0) and (Y >= yTurnSlider) and