Changeset 431 for trunk/LocalPlayer/Select.pas

Timestamp:

Apr 28, 2022, 10:40:37 PM (2 years ago)

Author:

chronos

Message:

• Modified: Changed WindowMode numerical constants to enumeration.

File:

• trunk/LocalPlayer/Select.pas (modified) (5 diffs)

trunk/LocalPlayer/Select.pas

@@ -74 +74 @@
     // -2=empty, -1=ambiguous, other=only choice
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode: integer; ListKind: TListKind);
-    procedure ShowNewContent_CityProject(NewMode, cix: integer);
-    procedure ShowNewContent_MilReport(NewMode, p: integer);
+    procedure ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
+    procedure ShowNewContent_CityProject(NewMode: TWindowMode; cix: integer);
+    procedure ShowNewContent_MilReport(NewMode: TWindowMode; p: integer);
     procedure EcoChange;
     procedure TechChange;
@@ -928 +928 @@
         kModels, kChooseModel:
           if lix <> mixAll then
-            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or
-              wmPersistent, lix);
+            UnitStatDlg.ShowNewContent_OwnModel(wmPersistent, lix);
         kEModels:
-          UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or wmPersistent,
+          UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent,
             code[1, sb.Position + Sel]);
         kAllEModels, kChooseEModel:
           if lix <> mixAll then
-            UnitStatDlg.ShowNewContent_EnemyModel(FWindowMode or
-              wmPersistent, lix);
+            UnitStatDlg.ShowNewContent_EnemyModel(wmPersistent, lix);
         kAdvance, kFarAdvance, kScience, kChooseTech, kChooseETech, kStealTech:
           if lix = adMilitary then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+            HelpDlg.ShowNewContent(wmPersistent, hkText,
               HelpDlg.TextIndex('MILRES'))
           else if lix < adMilitary then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkAdv, lix);
+            HelpDlg.ShowNewContent(wmPersistent, hkAdv, lix);
         kProject:
           if lix = cpImp + imTrGoods then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkText,
+            HelpDlg.ShowNewContent(wmPersistent, hkText,
               HelpDlg.TextIndex('TRADINGGOODS'))
           else if lix and (cpImp + cpType) = 0 then
-            UnitStatDlg.ShowNewContent_OwnModel(FWindowMode or wmPersistent,
+            UnitStatDlg.ShowNewContent_OwnModel(wmPersistent,
               lix and cpIndex)
           else if (lix and cpType = 0) and (lix <> cpImp + imTrGoods) then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp,
+            HelpDlg.ShowNewContent(wmPersistent, hkImp,
               lix and cpIndex);
         kGov:
-          HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkMisc,
+          HelpDlg.ShowNewContent(wmPersistent, hkMisc,
             miscGovList);
         kShipPart, kEShipPart:
@@ -1655 +1653 @@
 end;
 
-procedure TListDlg.ShowNewContent(NewMode: integer; ListKind: TListKind);
+procedure TListDlg.ShowNewContent(NewMode: TWindowMode; ListKind: TListKind);
 var
   i: integer;
@@ -1740 +1738 @@
 end; // ShowNewContent
 
-procedure TListDlg.ShowNewContent_CityProject(NewMode, cix: integer);
+procedure TListDlg.ShowNewContent_CityProject(NewMode: TWindowMode; cix: integer);
 begin
   cixProject := cix;
@@ -1746 +1744 @@
 end;
 
-procedure TListDlg.ShowNewContent_MilReport(NewMode, p: integer);
+procedure TListDlg.ShowNewContent_MilReport(NewMode: TWindowMode; p: integer);
 begin
   pView := p;