Changeset 325 for trunk/LocalPlayer/Term.pas

Timestamp:

Mar 23, 2021, 10:49:30 PM (4 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

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

trunk/LocalPlayer/Term.pas

@@ -224 +224 @@
     procedure MovieSpeedBtnClick(Sender: TObject);
   private
-    xw, yw, xwd, ywd, xwMini, ywMini, xMidPanel, xRightPanel, xTroop, xTerrain,
-      xMini, yMini, ywmax, ywcenter, TroopLoc, TrCnt, TrRow, TrPitch, MapWidth,
-      MapOffset, MapHeight, BlinkTime, BrushLoc, EditLoc, xMouse,
-      yMouse: integer;
+    xw: Integer;
+    yw: Integer;
+    xwd: Integer;
+    ywd: Integer;
+    xwMini: Integer;
+    ywMini: Integer;
+    xMidPanel: Integer;
+    xRightPanel: Integer;
+    xTroop: Integer;
+    xTerrain: Integer;
+    xMini: Integer;
+    yMini: Integer;
+    ywmax: Integer;
+    ywcenter: Integer;
+    TroopLoc: Integer;
+    TrCnt: Integer;
+    TrRow: Integer;
+    TrPitch: Integer;
+    MapWidth: Integer;
+    MapOffset: Integer;
+    MapHeight: Integer;
+    BlinkTime: Integer;
+    BrushLoc: Integer;
+    EditLoc: Integer;
+    xMouse: Integer;
+    yMouse: Integer;
     BrushType: Cardinal;
-    trix: array [0 .. 63] of integer;
+    trix: array [0 .. 63] of Integer;
     AILogo: array [0 .. nPl - 1] of TBitmap;
-    Mini, Panel, TopBar: TBitmap;
+    Mini: TBitmap;
+    Panel: TBitmap;
+    TopBar: TBitmap;
     sb: TPVScrollbar;
-    Closable, RepaintOnResize, Tracking, TurnComplete, Edited, GoOnPhase,
-      HaveStrategyAdvice, FirstMovieTurn: boolean;
+    Closable: Boolean;
+    RepaintOnResize: Boolean;
+    Tracking: Boolean;
+    TurnComplete: Boolean;
+    Edited: Boolean;
+    GoOnPhase: Boolean;
+    HaveStrategyAdvice: Boolean;
+    FirstMovieTurn: Boolean;
     PrevWindowState: TWindowState;
     CurrentWindowState: TWindowState;
@@ -322 +352 @@
   end;
 
-  TPriceSet = Set of $00 .. $FF;
+  TPriceSet = set of $00 .. $FF;
 
 const
@@ -416 +446 @@
   sbAll = $FF;
 
-  TileSizes: array [TTileSize] of TPoint = ((X: 33; Y: 16), (X: 48; Y: 24), (X: 72; Y: 36));
+  TileSizes: array [TTileSize] of TPoint = ((X: 33; Y: 16), (X: 48; Y: 24),
+    (X: 72; Y: 36));
 
 type
@@ -432 +463 @@
     ToldWonders: array [0 .. 27] of TWonderInfo;
     ToldTech: array [0 .. nAdv - 1] of ShortInt;
+  end;
+
+  TDipMem = record
+    pContact: Integer;
+    SentCommand: Integer;
+    FormerTreaty: Integer;
+    SentOffer: TOffer;
+    DeliveredPrices: TPriceSet;
+    ReceivedPrices: TPriceSet;
   end;
 
@@ -468 +508 @@
   TribeOriginal: array [0 .. nPl - 1] of Boolean;
   LostArmy: array [0 .. nPl * nMmax - 1] of Integer;
-  DipMem: array [0 .. nPl - 1] of record
-    pContact: Integer;
-    SentCommand: Integer;
-    FormerTreaty: Integer;
-    SentOffer: TOffer;
-    DeliveredPrices: TPriceSet;
-    ReceivedPrices: TPriceSet;
-  end;
+  DipMem: array [0 .. nPl - 1] of TDipMem;
 
 function CityEventName(i: integer): string;
@@ -4189 +4222 @@
       Brush.Style := bsClear;
       OffscreenUser := self;
-      exit
+      exit;
     end;
 
@@ -4214 +4247 @@
     offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
     ProcessRect(xw, yw, MapWidth div xxt, MapHeight div yyt,
-      prPaint or prInvalidate)
+      prPaint or prInvalidate);
   end
   else
@@ -4285 +4318 @@
         TopBarHeight + MapHeight - overlap);
     RectInvalidate(xMidPanel, TopBarHeight + MapHeight - overlap, xRightPanel,
-      TopBarHeight + MapHeight)
+      TopBarHeight + MapHeight);
   end;
   // if (xwd<>xw) or (ywd<>yw) then
@@ -4953 +4986 @@
   end;
   RectInvalidate(0, 0, ClientWidth, TopBarHeight);
-end; { PanelPaint }
+end;
 
 procedure TMainScreen.FocusOnLoc(Loc: integer; Options: integer = 0);
@@ -4968 +5001 @@
   begin
     Centre(Loc);
-    PaintAllMaps
+    PaintAllMaps;
   end
   else if not MapValid then
@@ -5003 +5036 @@
         begin
           NewFocus := uix;
-          Break
+          Break;
         end
         else
@@ -5011 +5044 @@
           begin
             NewFocus := uix;
-            Dist := TestDist
-          end
-        end
+            Dist := TestDist;
+          end;
+        end;
     end;
     if GotoOnly then
@@ -5043 +5076 @@
     PanelPaint;
   end;
-end; { NextUnit }
+end;
 
 procedure TMainScreen.Scroll(dx, dy: integer);
@@ -5083 +5116 @@
           PaintLocTemp(MyUn[UnFocus].Loc)
         else if TurnComplete and not supervising then
-          EOT.SetButtonIndexFast(eotBlinkOn)
-      end
+          EOT.SetButtonIndexFast(eotBlinkOn);
+      end;
     end
     else
@@ -5113 +5146 @@
             Screen.ActiveForm.OnDeactivate(nil);
           Scroll(dx, dy);
-        end
+        end;
       end;
 
@@ -5134 +5167 @@
           EOT.SetButtonIndexFast(eotBlinkOff)
         else if BlinkTime = BlinkOffTime then
-          EOT.SetButtonIndexFast(eotBlinkOn)
-      end
-    end
+          EOT.SetButtonIndexFast(eotBlinkOn);
+      end;
+    end;
 end;
 
@@ -5155 +5188 @@
     else if yw > ywmax then
       yw := ywmax;
-  end
+  end;
 end;