Changeset 531 for trunk/LocalPlayer/Term.pas

Timestamp:

Mar 27, 2024, 12:31:14 PM (6 weeks ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

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

trunk/LocalPlayer/Term.pas

@@ -421 +421 @@
     procedure UpdateKeyShortcuts;
     procedure SetFullScreen(Active: Boolean);
-    procedure PaintZoomedTile(dst: TBitmap; X, Y, Loc: Integer);
+    procedure PaintZoomedTile(Dst: TBitmap; X, Y, Loc: Integer);
   public
     UsedOffscreenWidth: Integer;
@@ -850 +850 @@
 function AttackSound(Code: Integer): string;
 begin
-  Result := 'ATTACK_' + char(48 + Code div 100 mod 10) +
-    char(48 + Code div 10 mod 10) + char(48 + Code mod 10);
+  Result := 'ATTACK_' + Char(48 + Code div 100 mod 10) +
+    Char(48 + Code div 10 mod 10) + Char(48 + Code mod 10);
 end;
 
@@ -931 +931 @@
           else OpenSound:=AttackSound(ModelCode(mi)); }
         if MyModel[MyData.ToldModels].Kind = mkSelfDeveloped then
-          OpenSound := 'NEWMODEL_' + char(48 + Age);
+          OpenSound := 'NEWMODEL_' + Char(48 + Age);
         MessgText := Phrases.Lookup('MODELAVAILABLE');
         if GameMode = cMovie then
@@ -989 +989 @@
 end;
 
-procedure TMainScreen.PaintZoomedTile(dst: TBitmap; X, Y, Loc: Integer);
+procedure TMainScreen.PaintZoomedTile(Dst: TBitmap; X, Y, Loc: Integer);
 
   procedure TSprite(xDst, yDst, xSrc, ySrc: Integer);
   begin
     with NoMapPanel do
-      Sprite(dst, HGrTerrain, X + xDst, Y + yDst, xxt * 2, yyt * 3,
+      Sprite(Dst, HGrTerrain, X + xDst, Y + yDst, xxt * 2, yyt * 3,
         1 + xSrc * (xxt * 2 + 1), 1 + ySrc * (yyt * 3 + 1));
   end;
@@ -1001 +1001 @@
   begin
     with NoMapPanel do begin
-      Sprite(dst, HGrTerrain, X + xxt, Y + yyt + 2, xxt * 2, yyt * 2 - 2,
+      Sprite(Dst, HGrTerrain, X + xxt, Y + yyt + 2, xxt * 2, yyt * 2 - 2,
         1 + xSrc * (xxt * 2 + 1), 3 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, X + 4, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      Sprite(Dst, HGrTerrain, X + 4, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
         5 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, X + xxt * 2, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
+      Sprite(Dst, HGrTerrain, X + xxt * 2, Y + 2 * yyt, xxt * 2 - 4, yyt * 2,
         1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
-      Sprite(dst, HGrTerrain, X + xxt, Y + yyt * 3, xxt * 2, yyt * 2 - 2,
+      Sprite(Dst, HGrTerrain, X + xxt, Y + yyt * 3, xxt * 2, yyt * 2 - 2,
         1 + xSrc * (xxt * 2 + 1), 1 + yyt + ySrc * (yyt * 3 + 1));
     end;
@@ -1519 +1519 @@
   Color: TColor;
   Name: string;
-  ok: Boolean;
+  Ok: Boolean;
 begin
   UnusedTribeFiles.Clear;
-  ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*' + CevoTribeExt,
+  Ok := FindFirst(LocalizedFilePath('Tribes') + DirectorySeparator + '*' + CevoTribeExt,
     faArchive + faReadOnly, SearchRec) = 0;
-  if not ok then
+  if not Ok then
   begin
     FindClose(SearchRec);
-    ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*' + CevoTribeExt),
+    Ok := FindFirst(LocalizedFilePath('Tribes' + DirectorySeparator + '*' + CevoTribeExt),
       faArchive + faReadOnly, SearchRec) = 0;
   end;
-  if ok then
+  if Ok then
     repeat
       SearchRec.Name := Copy(SearchRec.Name, 1, Length(SearchRec.Name) - Length(CevoTribeExt));
@@ -2078 +2078 @@
         else
         begin
-          S := Tribe[Me].TPhrase('AGE' + char(48 + Age));
+          S := Tribe[Me].TPhrase('AGE' + Char(48 + Age));
           MessgText := Format(S, [TurnToString(MyRO.Turn)]);
         end;
@@ -2086 +2086 @@
         { else begin Kind:=mkOkHelp; HelpKind:=hkAdv; HelpNo:=AgePreq[age]; end };
         CenterTo := NewAgeCenterTo;
-        OpenSound := 'AGE_' + char(48 + Age);
+        OpenSound := 'AGE_' + Char(48 + Age);
         Application.ProcessMessages;
         ShowModal;
@@ -2250 +2250 @@
           Item := 'RESEARCH_GENERAL';
           if GameMode <> cMovie then
-            OpenSound := 'NEWADVANCE_' + char(48 + Age);
+            OpenSound := 'NEWADVANCE_' + Char(48 + Age);
           Item2 := Phrases.Lookup('ADVANCES', ad);
           if ad in FutureTech then
@@ -2444 +2444 @@
               begin // !!! Shinkansen
                 MoveResult := eOK;
-                ok := True;
+                Ok := True;
                 for I := 0 to MoveAdviceData.nStep - 1 do
                 begin
@@ -2454 +2454 @@
                   // don't attack during auto move
                   begin
-                    ok := False;
-                    Break
+                    Ok := False;
+                    Break;
                   end
                   else
@@ -2471 +2471 @@
                     then
                     begin
-                      ok := False;
+                      Ok := False;
                       Break;
                     end;
@@ -2478 +2478 @@
                 Stop := not ok or (Loc = MoveAdviceData.ToLoc) or
                   (MoveAdviceData.ToLoc = maNextCity) and
-                  (MyMap[Loc] and fCity <> 0)
+                  (MyMap[Loc] and fCity <> 0);
               end
               else
@@ -2977 +2977 @@
           with MessgExDlg do
           begin
-            OpenSound := 'CONTACT_' + char(48 + MyRO.EnemyReport[Integer(Data)
+            OpenSound := 'CONTACT_' + Char(48 + MyRO.EnemyReport[Integer(Data)
               ].Attitude);
             MessgText := Tribe[Integer(Data)].TPhrase('FRCONTACT');
@@ -3005 +3005 @@
         InitTurn(NewPlayer);
         if Command = scDipStart then
-          Play('CONTACT_' + char(48 + MyRO.Attitude[DipMem[NewPlayer]
+          Play('CONTACT_' + Char(48 + MyRO.Attitude[DipMem[NewPlayer]
             .pContact]))
         else if Command = scDipCancelTreaty then
@@ -4718 +4718 @@
 var
   ProcessOptions: Integer;
-  rec: TRect;
+  Rec: TRect;
   DoInvalidate: Boolean;
 begin
@@ -4759 +4759 @@
         Exit; { map window not moved }
       Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
-      rec := Rect(0, 0, MapWidth, MapHeight);
+      Rec := Rect(0, 0, MapWidth, MapHeight);
 {$IFDEF WINDOWS}
       ScrollDC(Offscreen.Canvas.Handle, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
@@ -4766 +4766 @@
 {$IFDEF UNIX}
       ScrollDC(Offscreen.Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
-        rec, rec, 0, nil);
+        Rec, Rec, 0, nil);
 {$ENDIF}
       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,
@@ -4777 +4777 @@
 {$IFDEF UNIX}
           ScrollDC(Canvas, (xwd - xw) * (xxt * 2), (ywd - yw) * yyt,
-            rec, rec, 0, nil);
+            Rec, Rec, 0, nil);
 {$ENDIF}
           ProcessOptions := prInvalidate;
@@ -7153 +7153 @@
     else if BHelp.Test(ShortCut) then mHelp.Click;
     (*if Shift = [ssCtrl] then
-      case char(Key) of
+      case Char(Key) of
          'A':
           begin // auto symmetry