Changeset 590 for trunk/Database.pas

Timestamp:

Jul 24, 2024, 10:25:56 PM (4 months ago)

Author:

chronos

Message:

• Modified: Map load and save moved to separate class TMap.

File:

• trunk/Database.pas (modified) (9 diffs)

trunk/Database.pas

@@ -7 +7 @@
 
 uses
-  SysUtils, Protocol, CmdList;
+  SysUtils, Protocol, CmdList, Map;
 
 const
@@ -120 +120 @@
 function MapGeneratorAvailable: Boolean;
 procedure CreateElevation;
-procedure CreateMap(preview: Boolean);
+procedure CreateMap(Preview: Boolean);
 procedure InitMapEditor;
 procedure ReleaseMapEditor;
@@ -970 +970 @@
 end;
 
-procedure CreateMap(preview: Boolean);
+procedure CreateMap(Preview: Boolean);
 const
   ShHiHills = 6; { of land }
@@ -1089 +1089 @@
 
 var
-  X, Y, N, Dir, plus, Count, Loc0, Loc1, bLand, bHills, bMountains, V8: Integer;
+  X, Y, N, Dir, Plus, Count, Loc0, Loc1, bLand, bHills, bMountains, V8: Integer;
   CopyFrom: array [0 .. lxmax * lymax - 1] of Integer;
   Adjacent: TVicinity8Loc;
@@ -1095 +1095 @@
 begin
   FillChar(RealMap, MapSize * SizeOf(Cardinal), 0);
-  plus := 0;
+  Plus := 0;
   bMountains := 256;
-  while plus < MapSize * LandMass * ShMountains div 10000 do
+  while Plus < MapSize * LandMass * ShMountains div 10000 do
   begin
     Dec(bMountains);
-    Inc(plus, ElCount[bMountains]);
-  end;
-  Count := plus;
-  plus := 0;
+    Inc(Plus, ElCount[bMountains]);
+  end;
+  Count := Plus;
+  Plus := 0;
   bHills := bMountains;
-  while plus < MapSize * LandMass * ShHiHills div 10000 do
+  while Plus < MapSize * LandMass * ShHiHills div 10000 do
   begin
     Dec(bHills);
-    Inc(plus, ElCount[bHills]);
-  end;
-  Inc(Count, plus);
+    Inc(Plus, ElCount[bHills]);
+  end;
+  Inc(Count, Plus);
   bLand := bHills;
   while Count < MapSize * LandMass div 100 do
@@ -1144 +1144 @@
     end;
 
-  if not preview then
-  begin
-    plus := 36 * 56 * 20 * ShTestRiver div (LandMass * 100);
-    if plus > MapSize then
-      plus := MapSize;
+  if not Preview then
+  begin
+    Plus := 36 * 56 * 20 * ShTestRiver div (LandMass * 100);
+    if Plus > MapSize then
+      Plus := MapSize;
     Loc0 := DelphiRandom(MapSize);
-    for N := 0 to plus - 1 do
+    for N := 0 to Plus - 1 do
     begin
       if (RealMap[Loc0] and fTerrain >= fGrass) and (Loc0 >= lx) and
@@ -1267 +1267 @@
       ($F shl 27);
 
-  if not preview then
+  if not Preview then
   begin
     FindContinents;
@@ -1941 +1941 @@
 // cix=-2 - don't search city, don't calculate city benefits, just government of player p
 var
-  p0, Tile, special: Integer;
+  p0, Tile, Special: Integer;
 begin
   with Info do
@@ -1971 +1971 @@
     end; // no city found here
 
-    special := Tile and fSpecial and ResourceMask[P] shr 5;
+    Special := Tile and fSpecial and ResourceMask[P] shr 5;
     with Terrain[Tile and fTerrain] do
     begin
-      Food := FoodRes[special];
-      Prod := ProdRes[special];
-      Trade := TradeRes[special];
-      if (special > 0) and (Tile and fTerrain <> fGrass) and
+      Food := FoodRes[Special];
+      Prod := ProdRes[Special];
+      Trade := TradeRes[Special];
+      if (Special > 0) and (Tile and fTerrain <> fGrass) and
         (RW[P].NatBuilt[imSpacePort] > 0) then
       begin // GeoSat effect