Changeset 271

Timestamp:

Jan 28, 2019, 10:53:09 PM (6 years ago)

Author:

chronos

Message:

• Modified: Do not generate players in New game map preview.

Location:

trunk

Files:

• Forms/UFormNew.pas (modified) (2 diffs)
• UGame.pas (modified) (6 diffs)

trunk/Forms/UFormNew.pas

@@ -406 +406 @@
   SaveGame(GamePreview);
   GamePreview.PostConfig;
+  GamePreview.GeneratePlayers := False;
   GamePreview.New;
   GamePreview.CurrentPlayer := GamePreview.Players.First;
@@ -415 +416 @@
   Client.View.DestRect := TRect.Create(TPoint.Create(0, 0), TPoint.Create(Image1.Width, Image1.Height));
   Client.View.ZoomAll;
-  Client.ControlPlayer := GamePreview.Players.First;
+  //Client.ControlPlayer := GamePreview.Players.First;
   Client.ShowCellGrid := True;
   Bitmap.Canvas.Brush.Color := MapBackgroundColor; //clBackground; //PaintBox1.GetColorResolvingParent;

trunk/UGame.pas

@@ -54 +54 @@
     procedure BuildTerrain;
     procedure PlaceCities;
+    procedure InitPlayers;
     procedure SelectPlayerStartCell(Player: TPlayer);
     procedure CalculatePlayersDistance;
@@ -84 +85 @@
     MaxPower: Integer;
     StoredRandSeed: Cardinal;
+    GeneratePlayers: Boolean;
     procedure PostConfig;
     procedure Assign(Source: TGame);
@@ -308 +310 @@
     if (Terrain = ttNormal) and CityEnabled and (Random < CityPercentage / 100) then
       Terrain := ttCity;
+  end;
+end;
+
+procedure TGame.InitPlayers;
+var
+  I: Integer;
+  Player: TPlayer;
+begin
+  if not GeneratePlayers then Exit;
+
+  for Player in Players do begin
+    Player.Reset;
+    Player.StartCell := nil;
+  end;
+  I := 0;
+  for Player in Players do
+  with Player do begin
+    PlayerMap.Update;
+    if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
+      SelectPlayerStartCell(Player);
+      if Assigned(Player.StartCell) then begin
+        if SymetricMap and (I = 1) then
+          StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(Players[0].StartCell)];
+
+        if CityEnabled then StartCell.Terrain := ttCity;
+        StartCell.Player := Player;
+        if not Assigned(StartCell.OneUnit) then
+          StartCell.OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Player.StartUnits);
+        StartCell.OneUnit.Power := Player.StartUnits;
+        StartCell.OneUnit.Kind := GameSystem.UnitKinds[0];
+      end;
+    end;
+    PlayerMap.CheckVisibility;
+    Inc(I);
   end;
 end;
@@ -806 +842 @@
   Players.Game := Self;
 
+  GeneratePlayers := True;
   MapImageFileName := 'Images/Maps/WorldMap.png';
   Randomize;
+  StoredRandSeed := RandSeed;
   InitDefaultPlayers;
 
@@ -835 +873 @@
 
 procedure TGame.New;
-var
-  I: Integer;
-  Player: TPlayer;
 begin
   Clear;
@@ -859 +894 @@
   end;
 
-  for Player in Players do begin
-    Player.Reset;
-    Player.StartCell := nil;
-  end;
-  I := 0;
-  for Player in Players do
-  with Player do begin
-    PlayerMap.Update;
-    if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
-      SelectPlayerStartCell(Player);
-      if Assigned(Player.StartCell) then begin
-        if SymetricMap and (I = 1) then
-          StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(Players[0].StartCell)];
-
-        StartCell.Terrain := ttCity;
-        StartCell.Player := Player;
-        if not Assigned(StartCell.OneUnit) then
-          StartCell.OneUnit := Units.AddNew(GameSystem.UnitKinds[0], Player.StartUnits);
-        StartCell.OneUnit.Power := Player.StartUnits;
-        StartCell.OneUnit.Kind := GameSystem.UnitKinds[0];
-      end;
-    end;
-    PlayerMap.CheckVisibility;
-    Inc(I);
-  end;
+  InitPlayers;
   if Players.Count > 0 then CurrentPlayer := Players[0]
     else CurrentPlayer := nil;