Changeset 432

Timestamp:

Apr 28, 2022, 10:46:44 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Incorrectly renamed function.

Location:

trunk

Files:

• LocalPlayer/CityScreen.pas (modified) (2 diffs)
• LocalPlayer/CityType.pas (modified) (2 diffs)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Enhance.pas (modified) (1 diff)
• LocalPlayer/Nego.pas (modified) (1 diff)
• LocalPlayer/Wonders.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (2 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -1204 +1204 @@
         if iix >= 0 then
           if ssShift in Shift then
-            HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp, iix)
+            HelpDlg.ShowNewContent(WindowModeMakePersistent(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, WindowModePersistent(FWindowMode))
+            HelpOnTerrain(Loc1, WindowModeMakePersistent(FWindowMode))
         end
         else if (ClientMode < scContact) and (cGov <> gAnarchy) and

trunk/LocalPlayer/CityType.pas

@@ -246 +246 @@
   begin
     if ssShift in Shift then
-      HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp,
+      HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp,
         MyData.ImpOrder[ctype, i])
     else
@@ -263 +263 @@
   begin
     if ssShift in Shift then
-      HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp, Pooliix[i])
+      HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, Pooliix[i])
     else
     begin

trunk/LocalPlayer/Draft.pas

@@ -532 +532 @@
       i := (y - yFeature) div LinePitch;
       if (x >= xFeature - 21) and (x < ClientWidth) and (ssShift in Shift) then
-        HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkFeature, code[i])
+        HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkFeature, code[i])
       else if not(code[i] in AutoFeature) then
       begin

trunk/LocalPlayer/Enhance.pas

@@ -384 +384 @@
   ShortCut := KeyToShortCut(Key, Shift);
   if BHelp.Test(ShortCut) then
-    HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkText,
+    HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkText,
       HelpDlg.TextIndex('MACRO'))
 end;

trunk/LocalPlayer/Nego.pas

@@ -648 +648 @@
   if (X >= xNationPicture0) and (X < xNationPicture0 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(WindowModePersistent(FWindowMode), DipMem[me].pContact)
+    NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), DipMem[me].pContact)
   else if (X >= xNationPicture1) and (X < xNationPicture1 + 64) and
     (Y >= yNationPicture) and (Y < yNationPicture + 48) then
-    NatStatDlg.ShowNewContent(WindowModePersistent(FWindowMode), me)
+    NatStatDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), me)
 end;
 

trunk/LocalPlayer/Wonders.pas

@@ -351 +351 @@
 begin
   if Selection >= 0 then
-    HelpDlg.ShowNewContent(WindowModePersistent(FWindowMode), hkImp, Selection);
+    HelpDlg.ShowNewContent(WindowModeMakePersistent(FWindowMode), hkImp, Selection);
 end;
 

trunk/Packages/CevoComponents/BaseWin.pas

@@ -71 +71 @@
 
 procedure CreateOffscreen(var Offscreen: TBitmap);
-function WindowModePersistent(Mode: TWindowMode): TWindowMode;
+function WindowModeMakePersistent(Mode: TWindowMode): TWindowMode;
 procedure Register;
 
@@ -144 +144 @@
   if Key = VK_F1 then begin
     if Assigned(ShowNewContentProc) then
-      ShowNewContentProc(WindowModePersistent(FWindowMode), HelpContext);
+      ShowNewContentProc(WindowModeMakePersistent(FWindowMode), HelpContext);
   end else
   if FWindowMode = wmPersistent then begin