Changeset 350 for trunk

Timestamp:

Apr 6, 2021, 8:22:04 PM (4 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• Inp.pas (modified) (1 diff)
• LocalPlayer/Battle.pas (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/CityType.pas (modified) (10 diffs)
• LocalPlayer/Diagram.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Enhance.pas (modified) (1 diff)
• LocalPlayer/Help.pas (modified) (1 diff)
• LocalPlayer/NatStat.pas (modified) (1 diff)
• LocalPlayer/Nego.pas (modified) (1 diff)
• LocalPlayer/Rates.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (1 diff)
• LocalPlayer/UnitStat.pas (modified) (1 diff)
• NoTerm.pas (modified) (1 diff)

trunk/Inp.pas

@@ -37 +37 @@
   Canvas.Brush.Style := bsClear;
   TitleHeight := Height;
-  InitButtons();
+  InitButtons;
   Center := true;
 end;

trunk/LocalPlayer/Battle.pas

@@ -206 +206 @@
   OKBtn.Caption := Phrases.Lookup('BTN_YES');
   CancelBtn.Caption := Phrases.Lookup('BTN_NO');
-  InitButtons();
+  InitButtons;
 end;
 

trunk/LocalPlayer/CityScreen.pas

@@ -208 +208 @@
   AgePrepared := -2;
   Optimize_cixTileChange := -1;
-  InitButtons();
+  InitButtons;
   // InitWindowRegion;
   CloseBtn.Caption := Phrases.Lookup('BTN_OK');

trunk/LocalPlayer/CityType.pas

@@ -63 +63 @@
   inherited;
   CaptionRight := CloseBtn.Left;
-  InitButtons();
+  InitButtons;
   HelpContext := 'MACRO';
   Caption := Phrases.Lookup('TITLE_CITYTYPES');
@@ -71 +71 @@
 procedure TCityTypeDlg.CloseBtnClick(Sender: TObject);
 begin
-  Close
+  Close;
 end;
 
@@ -137 +137 @@
       Textout(xList + 20 + i mod nListCol * 42 - TextWidth(s) div 2,
         yList + 15 + i div nListCol * 32 - TextHeight(s) div 2, s);
-    end
+    end;
   end;
 
@@ -201 +201 @@
   begin
     include(listed, MyData.ImpOrder[ctype, i]);
-    inc(i)
-  end;
-  Changed := false
+    inc(i);
+  end;
+  Changed := false;
 end;
 
@@ -215 +215 @@
       if (MyCity[cix].Loc >= 0) and (MyCity[cix].Status and 7 = ctype + 1) then
         AutoBuild(cix, MyData.ImpOrder[ctype]);
-    Changed := false
+    Changed := false;
   end;
 end;
@@ -252 +252 @@
       dragiix := MyData.ImpOrder[ctype, i];
       Screen.Cursor := crImpDrag;
-      SmartUpdateContent
+      SmartUpdateContent;
     end;
     exit;
@@ -268 +268 @@
       dragiix := Pooliix[i];
       Screen.Cursor := crImpDrag;
-      SmartUpdateContent
+      SmartUpdateContent;
     end;
     exit;
@@ -279 +279 @@
     SaveType;
     LoadType(i);
-    SmartUpdateContent
-  end
+    SmartUpdateContent;
+  end;
 end;
 
@@ -318 +318 @@
       MyData.ImpOrder[ctype, i] := dragiix;
       include(listed, dragiix);
-      Changed := true
+      Changed := true;
     end
     else if (dragiix in listed) and (x >= xPool) and (x < xPool + nPoolCol * 42)
@@ -324 +324 @@
     begin
       UnList(dragiix);
-      Changed := true
+      Changed := true;
     end;
     dragiix := -1;
-    SmartUpdateContent
-  end;
-  Screen.Cursor := crDefault
+    SmartUpdateContent;
+  end;
+  Screen.Cursor := crDefault;
 end;
 

trunk/LocalPlayer/Diagram.pas

@@ -132 +132 @@
   CaptionRight := CloseBtn.Left;
   CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
-  InitButtons();
+  InitButtons;
 end;
 

trunk/LocalPlayer/Draft.pas

@@ -68 +68 @@
 begin
   inherited;
-  InitButtons();
+  InitButtons;
   HelpContext := 'CLASSES';
   Caption := Phrases.Lookup('TITLE_DRAFT');

trunk/LocalPlayer/Enhance.pas

@@ -65 +65 @@
   CaptionRight := CloseBtn.Left;
   CaptionLeft := ToggleBtn.Left + ToggleBtn.Width;
-  InitButtons();
+  InitButtons;
   HelpContext := 'MACRO';
   Caption := Phrases.Lookup('TITLE_ENHANCE');

trunk/LocalPlayer/Help.pas

@@ -301 +301 @@
   CaptionFont.Assign(UniFont[ftNormal]);
   CaptionFont.Style := CaptionFont.Style + [fsItalic, fsBold];
-  InitButtons();
+  InitButtons;
 
   TopBtn.Hint := Phrases.Lookup('BTN_CONTENTS');

trunk/LocalPlayer/NatStat.pas

@@ -81 +81 @@
   GetMem(SelfReport, SizeOf(TEnemyReport) - 2 * (INFIN + 1));
   ReportText := TStringList.Create;
-  InitButtons();
+  InitButtons;
   ContactBtn.Template := Templates.Data;
   HelpContext := 'DIPLOMACY';

trunk/LocalPlayer/Nego.pas

@@ -144 +144 @@
   cix: integer;
 begin
-  InitButtons();
+  InitButtons;
   for cix := 0 to ComponentCount - 1 do
     if Components[cix] is TButtonN then

trunk/LocalPlayer/Rates.pas

@@ -42 +42 @@
 begin
   TitleHeight := Screen.Height;
-  InitButtons();
+  InitButtons;
 end;
 

trunk/LocalPlayer/Select.pas

@@ -114 +114 @@
   sb.SetBorderSpacing(36, 10, 36);
   sb.OnUpdate := ScrollBarUpdate;
-  InitButtons();
+  InitButtons;
   Kind := kMission;
   Layer0Btn.Hint := Phrases.Lookup('BTN_IMPRS');

trunk/LocalPlayer/UnitStat.pas

@@ -77 +77 @@
   AgePrepared := -2;
   TitleHeight := Screen.Height;
-  InitButtons();
+  InitButtons;
 
   Back := TBitmap.Create;

trunk/NoTerm.pas

@@ -80 +80 @@
   Canvas.Font.Assign(UniFont[ftSmall]);
   TitleHeight := 36;
-  InitButtons();
+  InitButtons;
   LastShowYearTime := 0;
 end;