Changeset 328 for trunk/Database.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/Database.pas (modified) (7 diffs)

trunk/Database.pas

@@ -49 +49 @@
   GTestFlags: Integer;
   Mode: TGameMode;
-  GWonder: array [0 .. 27] of TWonderInfo;
+  GWonder: array [0 .. nWonder - 1] of TWonderInfo;
   ServerVersion: array [0 .. nPl - 1] of integer;
   ProcessClientData: array [0 .. nPl - 1] of boolean;
@@ -452 +452 @@
     ResourceMask[p] := ResourceMask[p] or fModern;
 
-  for i := 0 to 27 do { check whether wonders expired }
+  for i := 0 to nWonder - 1 do { check whether wonders expired }
     if (GWonder[i].EffectiveOwner <> GWonder[woEiffel].EffectiveOwner) and
       (Imp[i].Expiration = ad) then
@@ -3149 +3149 @@
   i, j, uix1, cix1, nearest: integer;
 begin
-  for i := 0 to 27 do
+  for i := 0 to nWonder - 1 do
     if RW[p].City[cix].Built[i] = 1 then
     begin
@@ -3156 +3156 @@
         FreeSlaves;
       if i = woEiffel then // deactivate expired wonders
-        for j := 0 to 27 do
+        for j := 0 to nWonder - 1 do
           if GWonder[j].EffectiveOwner = p then
             CheckExpiration(j);
     end;
-  for i := 28 to nImp - 1 do
+  for i := nWonder to nImp - 1 do
     if (Imp[i].Kind <> ikCommon) and (RW[p].City[cix].Built[i] > 0) then
     begin { destroy national projects }
@@ -3191 +3191 @@
 begin
   StealCity(p, cix, SaveUnits);
-  with RW[p].City[cix] do
-  begin
-    for i := 0 to 27 do
+  with RW[p].City[cix] do begin
+    for i := 0 to nWonder - 1 do
       if Built[i] > 0 then
         GWonder[i].CityID := WonderDestroyed;
@@ -3243 +3242 @@
     Built[imTownHall] := 0;
     Built[imCourt] := 0;
-    for i := 28 to nImp - 1 do
+    for i := nWonder to nImp - 1 do
       if Imp[i].Kind <> ikCommon then
         Built[i] := 0; { destroy national projects }
-    for i := 0 to 27 do
+    for i := 0 to nWonder - 1 do
       if Built[i] = 1 then
       begin // new wonder owner!
@@ -3252 +3251 @@
         if i = woEiffel then // reactivate expired wonders
         begin
-          for j := 0 to 27 do
+          for j := 0 to nWonder - 1 do
             if Imp[j].Expiration >= 0 then
               for cix1 := 0 to (RW[pNew].nCity - 1) do
                 if RW[pNew].City[cix1].Built[j] = 1 then
-                  GWonder[j].EffectiveOwner := pNew
+                  GWonder[j].EffectiveOwner := pNew;
         end
         else