Changeset 328 for trunk/LocalPlayer

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/LocalPlayer

Files:

• CityScreen.pas (modified) (5 diffs)
• CityType.pas (modified) (1 diff)
• ClientTools.pas (modified) (1 diff)
• Help.pas (modified) (9 diffs)
• Select.pas (modified) (2 diffs)
• Term.pas (modified) (19 diffs)

trunk/LocalPlayer/CityScreen.pas

@@ -325 +325 @@
     for i := 0 to 29 do
     begin
-      for iix := 28 to nImp - 1 do
+      for iix := nWonder to nImp - 1 do
         if (ImpPosition[iix] = i) and (c.Built[iix] > 0) then
         begin
@@ -336 +336 @@
     i := 30;
     for iix := 0 to nImp do
-      if (c.Built[iix] > 0) and ((iix < 28) or (ImpPosition[iix] < 0)) then
+      if (c.Built[iix] > 0) and ((iix < nWonder) or (ImpPosition[iix] < 0)) then
       begin
         FillRect(Rect(5 + 16 * (i mod 3) + 48 * (i div 18),
@@ -350 +350 @@
       if iix <> imTrGoods then
       begin
-        if (iix >= 28) and (ImpPosition[iix] >= 0) then
+        if (iix >= nWonder) and (ImpPosition[iix] >= 0) then
           i := ImpPosition[iix];
         if i < 36 then
@@ -827 +827 @@
       Cnt := 0;
       for iix := 0 to nImp - 1 do
-        if ((iix < 28) or (ImpPosition[iix] < 0)) and (c.Built[iix] > 0) then
+        if ((iix < nWonder) or (ImpPosition[iix] < 0)) and (c.Built[iix] > 0) then
         begin
           i := Cnt - Page * 6;
@@ -838 +838 @@
     else
     begin
-      for iix := 28 to nImp - 1 do
+      for iix := nWonder to nImp - 1 do
       begin
         i := ImpPosition[iix] - 6 * ZoomArea;

trunk/LocalPlayer/CityType.pas

@@ -158 +158 @@
 
   nPool := 0;
-  for iix := 28 to nImp - 1 do
+  for iix := nWonder to nImp - 1 do
     if not(iix in listed) and (Imp[iix].Kind = ikCommon) and (iix <> imTrGoods)
       and (Imp[iix].Preq <> preNA) and

trunk/LocalPlayer/ClientTools.pas

@@ -261 +261 @@
       Inc(Result, CityReport.FoodSurplus);
   end;
-  for i := 28 to nImp - 1 do
+  for i := nWonder to nImp - 1 do
     if MyCity[cix].Built[i] > 0 then
       Dec(Result, Imp[i].Maint);

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

trunk/LocalPlayer/Select.pas

@@ -1068 +1068 @@
         code[0, 0] := cpImp + imTrGoods;
         Lines[0] := 1;
-        for i := 28 to nImp - 1 do
+        for i := nWonder to nImp - 1 do
           if Imp[i].Kind = ikCommon then
             TryAddImpLine(0, i + cpImp);
-        for i := 28 to nImp - 1 do
+        for i := nWonder to nImp - 1 do
           if not(Imp[i].Kind in [ikCommon, ikTrGoods]) and
             ((MyRO.NatBuilt[i] = 0) or (Imp[i].Kind = ikNatLocal)) then
@@ -1083 +1083 @@
 
         // wonders
-        for i := 0 to 27 do
+        for i := 0 to nWonder - 1 do
           TryAddImpLine(1, i + cpImp);
 

trunk/LocalPlayer/Term.pas

@@ -458 +458 @@
     EnhancementJobs: TEnhancementJobs;
     ImpOrder: array [0 .. nCityType - 1] of TImpOrder;
-    ToldWonders: array [0 .. 27] of TWonderInfo;
+    ToldWonders: array [0 .. nWonder - 1] of TWonderInfo;
     ToldTech: array [0 .. nAdv - 1] of ShortInt;
   end;
@@ -469 +469 @@
     DeliveredPrices: TPriceSet;
     ReceivedPrices: TPriceSet;
+  end;
+
+  TCurrentMoveInfo = record
+    AfterMovePaintRadius: Integer;
+    AfterAttackExpeller: Integer;
+    DoShow: Boolean;
+    IsAlly: Boolean;
   end;
 
@@ -568 +575 @@
 
 var
-  Jump: array [0 .. nPl - 1] of integer;
-  pTurn, pLogo, UnStartLoc, ToldSlavery: integer;
-  SmallScreen, GameOK, MapValid, skipped, idle: boolean;
-
-  SaveOption: array of integer;
-  MiniColors: array [0..11, 0..1] of TColor;
+  Jump: array [0 .. nPl - 1] of Integer;
+  pTurn: Integer;
+  pLogo: Integer;
+  UnStartLoc: Integer;
+  ToldSlavery: Integer;
+  SmallScreen: Boolean;
+  GameOK: Boolean;
+  MapValid: Boolean;
+  Skipped: Boolean;
+  Idle: Boolean;
+
+  SaveOption: array of Integer;
   MainMap: TIsoMap;
-  CurrentMoveInfo: record AfterMovePaintRadius, AfterAttackExpeller: integer;
-  DoShow, IsAlly: boolean;
-end;
+  CurrentMoveInfo: TCurrentMoveInfo;
 
 function CityEventName(i: integer): string;
@@ -1070 +1081 @@
       begin
         result := false;
-        exit
+        exit;
       end;
       ChosenResearch := ModalSelectDlg.result;
@@ -1396 +1407 @@
   begin
     need := false;
-    for i := 0 to 27 do
+    for i := 0 to nWonder - 1 do
       if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
         need := true;
@@ -1492 +1503 @@
           $FF - Tribe[i].Color and $FF) * 2;
         if TestColorDistance < ColorDistance then
-          ColorDistance := TestColorDistance
+          ColorDistance := TestColorDistance;
       end;
     if ColorDistance > BestColorDistance then
     begin
       CountBest := 0;
-      BestColorDistance := ColorDistance
+      BestColorDistance := ColorDistance;
     end;
     if ColorDistance = BestColorDistance then
@@ -1503 +1514 @@
       inc(CountBest);
       if DelphiRandom(CountBest) = 0 then
-        result := j
+        result := j;
     end;
   end;
@@ -1574 +1585 @@
         begin
           MostCost := TestCost;
-          IconIndex := imShipComp + i
+          IconIndex := imShipComp + i;
         end;
       end;
@@ -1586 +1597 @@
 procedure TMainScreen.InitModule;
 var
-  x, y, i, j, Domain: integer;
+  i, j, Domain: integer;
 begin
   { search icons for advances: }
@@ -1610 +1621 @@
               else
                 AdvIcon[i] := 86 + Domain;
-      for j := 28 to nImp - 1 do
+      for j := nWonder to nImp - 1 do
         if Imp[j].Preq = i then
           AdvIcon[i] := j;
-      for j := 28 to nImp - 1 do
+      for j := nWonder to nImp - 1 do
         if (Imp[j].Preq = i) and (Imp[j].Kind <> ikCommon) then
           AdvIcon[i] := j;
@@ -1619 +1630 @@
         if i = JobPreq[j] then
           AdvIcon[i] := 84;
-      for j := 0 to 27 do
+      for j := 0 to nWonder - 1 do
         if Imp[j].Preq = i then
           AdvIcon[i] := j;
@@ -1637 +1648 @@
   TribeNames := tstringlist.Create;
 
-  for x := 0 to 11 do
-    for y := 0 to 1 do
-      MiniColors[x, y] := HGrSystem.Data.Canvas.Pixels[66 + x, 67 + y];
   IsoEngine.Init(InitEnemyModel);
   if not IsoEngine.ApplyTileSize(TileSize) and (TileSize <> tsMedium) then
@@ -2049 +2057 @@
     end;
 
-    for i := 0 to 27 do
+    for i := 0 to nWonder - 1 do
     begin
       OwnWonder := false;
@@ -2221 +2229 @@
           if (MyRO.Turn > 0) and (Loc >= 0) and (Flags and chCaptured = 0) and
             (WondersOnly = (Flags and chProduction <> 0) and
-            (Project0 and cpImp <> 0) and (Project0 and cpIndex < 28)) then
+            (Project0 and cpImp <> 0) and (Project0 and cpIndex < nWonder)) then
           begin
             if WondersOnly then
@@ -2602 +2610 @@
                   inc(ToldAlive, 1 shl i);
               PeaceEvaHappened := 0;
-              for i := 0 to 27 do
+              for i := 0 to nWonder - 1 do
                 with ToldWonders[i] do
                 begin
@@ -5852 +5860 @@
     if CityCaptured and (MyMap[ToLoc] and fCity = 0) then
     begin // city destroyed
-      for i := 0 to 27 do { tell about destroyed wonders }
+      for i := 0 to nWonder - 1 do { tell about destroyed wonders }
         if (MyRO.Wonder[i].CityID = WonderDestroyed) and (MyData.ToldWonders[i].CityID <> WonderDestroyed)
         then
@@ -5874 +5882 @@
     begin // city captured
       ListDlg.AddCity;
-      for i := 0 to 27 do { tell about capture of wonders }
+      for i := 0 to nWonder - 1 do { tell about capture of wonders }
         if MyRO.City[MyRO.nCity - 1].Built[i] > 0 then
           with MessgExDlg do
@@ -7183 +7191 @@
       // check if city types already usefull:
       if MyRO.nCity > 0 then
-        for i := 28 to nImp - 1 do
+        for i := nWonder to nImp - 1 do
           if (i <> imTrGoods) and (Imp[i].Kind = ikCommon) and
             (Imp[i].Preq <> preNA) and
@@ -7262 +7270 @@
     mEUnitStat.Enabled := MyRO.nEnemyModel > 0;
     { mWonders.Enabled:= false;
-      for i:=0 to 27 do if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
+      for i:=0 to nWonder - 1 do if MyRO.Wonder[i].CityID <> WonderNotBuiltYet then
       mWonders.Enabled:=true; }
     mDiagram.Enabled := MyRO.Turn >= 2;