Changeset 349 for branches/highdpi/LocalPlayer/NatStat.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (3 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/LocalPlayer/NatStat.pas (modified) (6 diffs)

branches/highdpi/LocalPlayer/NatStat.pas

@@ -82 +82 @@
   ReportText := TStringList.Create;
   InitButtons();
-  ContactBtn.Template := Templates;
+  ContactBtn.Template := Templates.Data;
   HelpContext := 'DIPLOMACY';
   ToggleBtn.Hint := Phrases.Lookup('BTN_SELECT');
@@ -114 +114 @@
       (hMainTexture - ClientHeight) div 2);
     ImageOp_B(Back, Template, 0, 0, 0, 0, ClientWidth, ClientHeight);
-  end
+  end;
 end;
 
@@ -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
@@ -279 +279 @@
     // show leader picture
     Tribe[pView].InitAge(GetAge(pView));
-    if Tribe[pView].faceHGr >= 0 then
+    if Assigned(Tribe[pView].faceHGr) then
     begin
       Dump(offscreen, Tribe[pView].faceHGr, 18, yIcon - 4, 64, 48,
@@ -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