Changeset 431 for trunk/LocalPlayer/CityScreen.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Changed WindowMode numerical constants to enumeration.

File:

• trunk/LocalPlayer/CityScreen.pas (modified) (4 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -96 +96 @@
     CloseAction: TCityCloseAction;
     procedure OffscreenPaint; override;
-    procedure ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+    procedure ShowNewContent(NewMode: TWindowMode; Loc: integer; ShowEvent: cardinal);
     procedure Reset;
     procedure CheckAge;
@@ -1109 +1109 @@
 end;
 
-procedure TCityDlg.ShowNewContent(NewMode, Loc: integer; ShowEvent: cardinal);
+procedure TCityDlg.ShowNewContent(NewMode: TWindowMode; Loc: integer; ShowEvent: cardinal);
 begin
   if MyMap[Loc] and fOwned <> 0 then
@@ -1204 +1204 @@
         if iix >= 0 then
           if ssShift in Shift then
-            HelpDlg.ShowNewContent(FWindowMode or wmPersistent, hkImp, iix)
+            HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp, iix)
           else if (ClientMode < scContact) then
             with MessgExDlg do
@@ -1335 +1335 @@
           Loc1 := dLoc(cLoc, dx, dy);
           if (Loc1 >= 0) and (Loc1 < G.lx * G.ly) then
-            HelpOnTerrain(Loc1, FWindowMode or wmPersistent)
+            HelpOnTerrain(Loc1, WindowModePersistent(FWindowMode))
         end
         else if (ClientMode < scContact) and (cGov <> gAnarchy) and