Changeset 496 for trunk/LocalPlayer/Term.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Term.pas (modified) (26 diffs)

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),