Changeset 328 for trunk/LocalPlayer/Help.pas

Timestamp:

Mar 25, 2021, 3:02:29 PM (4 years ago)

Author:

chronos

Message:

• Modified: Use nWonder constant as number of wonders instead of numeric value.
• Modified: Code cleanup.

File:

• trunk/LocalPlayer/Help.pas (modified) (9 diffs)

trunk/LocalPlayer/Help.pas

@@ -1484 +1484 @@
                 hkMisc + hkCrossLink, miscGovList);
           NextSection('BUILDALLOW');
-          for i := 0 to 27 do
+          for i := 0 to nWonder - 1 do
             if Imp[i].Preq = no then
               AddImprovement(i);
-          for i := 28 to nImp - 1 do
+          for i := nWonder to nImp - 1 do
             if (Imp[i].Preq = no) and (Imp[i].Kind <> ikCommon) then
               AddImprovement(i);
-          for i := 28 to nImp - 1 do
+          for i := nWonder to nImp - 1 do
             if (Imp[i].Preq = no) and (Imp[i].Kind = ikCommon) then
               AddImprovement(i);
@@ -1527 +1527 @@
               end;
           NextSection('EXPIRATION');
-          for i := 0 to 27 do
+          for i := 0 to nWonder - 1 do
             if (Imp[i].Preq <> preNA) and (Imp[i].Expiration = no) then
               AddImprovement(i);
@@ -1545 +1545 @@
           List := THyperText.Create;
           List.OwnsObjects := True;
-          for i := 28 to nImp - 1 do
+          for i := nWonder to nImp - 1 do
             if (i <> imTrGoods) and (Imp[i].Preq <> preNA) and
               (Imp[i].Kind = ikCommon) then
@@ -1558 +1558 @@
           Caption := HelpText.Lookup('HELPTITLE_UNIQUELIST');
           // AddLine(HelpText.Lookup('HELPTITLE_UNIQUELIST'),pkSection);
-          for i := 28 to nImp - 1 do
+          for i := nWonder to nImp - 1 do
             if (Imp[i].Preq <> preNA) and
               ((Imp[i].Kind = ikNatLocal) or (Imp[i].Kind = ikNatGlobal)) then
@@ -1566 +1566 @@
             LineFeed;
             AddLine(HelpText.Lookup('HELPTITLE_SHIPPARTLIST'),pkSection);
-            for i:=28 to nImp-1 do
+            for i:= nWonder to nImp-1 do
             if (Imp[i].Preq<>preNA) and (Imp[i].Kind=ikShipPart) then
             AddLine(Phrases.Lookup('IMPROVEMENTS',i),pkSmallIcon,i,hkImp,i); }
@@ -1574 +1574 @@
           Caption := HelpText.Lookup('HELPTITLE_WONDERLIST');
           // AddLine(HelpText.Lookup('HELPTITLE_WONDERLIST'),pkSection);
-          for i := 0 to 27 do
+          for i := 0 to nWonder - 1 do
             if Imp[i].Preq <> preNA then
               AddLine(Phrases.Lookup('IMPROVEMENTS', i), pkSmallIcon, i,
@@ -1600 +1600 @@
             AddFeature(mcAcademy);
           end;
-          if (no < 28) and not Phrases2FallenBackToEnglish then
+          if (no < nWonder) and not Phrases2FallenBackToEnglish then
           begin
             LineFeed;
@@ -1646 +1646 @@
               [Phrases.Lookup('TERRAIN', 3 * 12 + i)]), pkTer, 3 * 12 + i);
           end;
-          if (no < 28) and (Imp[no].Expiration >= 0) then
+          if (no < nWonder) and (Imp[no].Expiration >= 0) then
           begin
             NextSection('EXPIRATION');
@@ -1656 +1656 @@
           end;
           NextSection('SEEALSO');
-          if (no < 28) and (Imp[no].Expiration >= 0) then
+          if (no < nWonder) and (Imp[no].Expiration >= 0) then
             AddImprovement(woEiffel);
           for i := 0 to nImpReplacement - 1 do