Changeset 270 for trunk/UGame.pas

Timestamp:

Jan 28, 2019, 10:38:17 PM (6 years ago)

Author:

chronos

Message:

• Modified: Keep randseed for randomly generated map preview inside New game form.
• Modified: Resize map preview with form resize.

File:

• trunk/UGame.pas (modified) (10 diffs)

trunk/UGame.pas

@@ -53 +53 @@
     procedure SetRunning(AValue: Boolean);
     procedure BuildTerrain;
+    procedure PlaceCities;
     procedure SelectPlayerStartCell(Player: TPlayer);
     procedure CalculatePlayersDistance;
@@ -82 +83 @@
     BridgeEnabled: Boolean;
     MaxPower: Integer;
+    StoredRandSeed: Cardinal;
     procedure PostConfig;
     procedure Assign(Source: TGame);
@@ -291 +293 @@
     if (VoidEnabled and (Random < VoidPercentage / 100)) or
     (Map.IsOutsideShape(PosPx)) then Terrain := ttVoid
-      else begin
-        if CityEnabled and (Random < CityPercentage / 100) then Terrain := ttCity
-          else Terrain := ttNormal;
-      end;
+      else Terrain := ttNormal;
     if not Assigned(OneUnit) then
       OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Random(MaxNeutralUnits + 1));
     Player := nil;
+  end;
+end;
+
+procedure TGame.PlaceCities;
+var
+  Cell: TCell;
+begin
+  for Cell in Map.Cells do
+  with Cell do begin
+    if (Terrain = ttNormal) and CityEnabled and (Random < CityPercentage / 100) then
+      Terrain := ttCity;
   end;
 end;
@@ -418 +428 @@
 procedure TGame.Assign(Source: TGame);
 begin
+  StoredRandSeed := Source.StoredRandSeed;
   DevelMode := Source.DevelMode;
   Players.Assign(Source.Players);
@@ -446 +457 @@
 begin
   with Config do begin
+    SetValue(DOMString(Path + '/RandSeed'), Integer(StoredRandSeed));
     SetValue(DOMString(Path + '/GridType'), Integer(MapType));
     SetValue(DOMString(Path + '/MapImage'), DOMString(MapImageFileName));
@@ -473 +485 @@
 begin
   with Config do begin
+    StoredRandSeed := GetValue(DOMString(Path + '/RandSeed'), 0);
     MapType := TMapType(GetValue(DOMString(Path + '/GridType'), Integer(mtHexagon)));
     Map.Size := TPoint.Create(GetValue(DOMString(Path + '/MapSizeX'), 10),
@@ -518 +531 @@
     RootNode := Doc.DocumentElement;
     with RootNode do begin
+      StoredRandSeed := ReadInteger(RootNode, 'RandSeed', 0);
       MapType := TMapType(ReadInteger(RootNode, 'MapType', Integer(mtNone)));
       SymetricMap := ReadBoolean(RootNode, 'SymetricMap', False);
@@ -580 +594 @@
     AppendChild(RootNode);
     with RootNode do begin
+      WriteInteger(RootNode, 'RandSeed', Integer(StoredRandSeed));
       WriteInteger(RootNode, 'MapType', Integer(MapType));
       WriteBoolean(RootNode, 'SymetricMap', SymetricMap);
@@ -825 +840 @@
 begin
   Clear;
+  RandSeed := StoredRandSeed;
   FileName := SNewGameFile;
   TurnCounter := 1;
@@ -832 +848 @@
   Map.MaxPower := MaxPower;
   BuildTerrain;
+  PlaceCities;
   WinObjectiveMapPrepare;