Changeset 349 for branches/highdpi/CityProcessing.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/CityProcessing.pas (modified) (8 diffs)

branches/highdpi/CityProcessing.pas

@@ -292 +292 @@
     begin { improvement project }
       result := Imp[Project and cpIndex].Cost;
-      if (Project and cpIndex < 28) and (GWonder[woColossus].EffectiveOwner = p)
+      if (Project and cpIndex < nWonder) and (GWonder[woColossus].EffectiveOwner = p)
       then
         result := result * ColossusEffect div 100;
@@ -370 +370 @@
           BaseHappiness := Size;
       end;
-      for i := 0 to 27 do
+      for i := 0 to nWonder - 1 do
         if Built[i] = 1 then
         begin
@@ -773 +773 @@
 begin
   with RW[p], City[cix] do
-    for i := 28 to nImp - 1 do
+    for i := nWonder to nImp - 1 do
       if (Built[i] > 0) and (Project0 and (cpImp or cpIndex) <> (cpImp or i))
       then // don't pay maintenance when just completed
@@ -971 +971 @@
 
     // check if wonder already built
-    if (Project and cpImp <> 0) and (Project and cpIndex < 28) and
-      (GWonder[Project and cpIndex].CityID <> -1) then
+    if (Project and cpImp <> 0) and (Project and cpIndex < nWonder) and
+      (GWonder[Project and cpIndex].CityID <> WonderNotBuiltYet) then
     begin
       inc(Flags, chOldWonder);
@@ -1050 +1050 @@
         end;
 
-        if NewImp < 28 then
+        if NewImp < nWonder then
         begin // wonder
           GWonder[NewImp].CityID := ID;
@@ -1060 +1060 @@
             woEiffel:
               begin // reactivate wonders
-                for i := 0 to 27 do
+                for i := 0 to nWonder - 1 do
                   if Imp[i].Expiration >= 0 then
                     for cix2 := 0 to nCity - 1 do
@@ -1303 +1303 @@
                 dxdy(Loc, Loc1, dx, dy);
                 dec(SubCriterion[(dy + 3) shl 2 + (dx + 3) shr 1], 160);
-              end
-            end
-          end
-        end
+              end;
+            end;
+          end;
+        end;
       end;
 
@@ -1414 +1414 @@
           Hierarchy[iH, iT].Trade := TileInfo.Trade;
           Hierarchy[iH, iT].SubValue := SubCriterion[V21];
-        end
+        end;
       end;
     if NeedRare <> 0 then