Changeset 327 for trunk/LocalPlayer/NatStat.pas

Timestamp:

Mar 25, 2021, 2:09:42 PM (4 years ago)

Author:

chronos

Message:

• Modified: Use enumeration type for MapOptions and game options.

File:

• trunk/LocalPlayer/NatStat.pas (modified) (3 diffs)

trunk/LocalPlayer/NatStat.pas

@@ -141 +141 @@
   ScrollDownBtn.Visible := (CurrentReport.TurnOfCivilReport >= 0) and
     (ReportText.Count > ReportLines);
-  if OptionChecked and (1 shl soTellAI) <> 0 then
+  if soTellAI in OptionChecked then
     TellAIBtn.ButtonIndex := 3
   else
@@ -390 +390 @@
     end;
 
-    if OptionChecked and (1 shl soTellAI) <> 0 then
-    begin
+    if soTellAI in OptionChecked then begin
       Server(sGetAIInfo, me, pView, ps);
       LoweredTextOut(Canvas, -1, MainTexture, 42, 445, ps);
-    end
-    else
+    end else
       LoweredTextOut(Canvas, -2, MainTexture, 42, 445,
         Phrases2.Lookup('MENU_TELLAI'));
@@ -537 +535 @@
 procedure TNatStatDlg.TellAIBtnClick(Sender: TObject);
 begin
-  OptionChecked := OptionChecked xor (1 shl soTellAI);
-  if OptionChecked and (1 shl soTellAI) <> 0 then
+  if soTellAI in OptionChecked then OptionChecked := OptionChecked - [soTellAI]
+    else OptionChecked := OptionChecked + [soTellAI];
+  if soTellAI in OptionChecked then
     TellAIBtn.ButtonIndex := 3
   else