Changeset 155

Timestamp:

Nov 16, 2017, 12:43:42 AM (6 years ago)

Author:

chronos

Message:

• Modified: Store player settings for new game separately to current game players.

Location:

trunk

Files:

• Forms/UFormNew.lfm (modified) (2 diffs)
• Forms/UFormNew.pas (modified) (2 diffs)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (8 diffs)

trunk/Forms/UFormNew.lfm

@@ -192 +192 @@
       object ComboBoxGridType: TComboBox
         Left = 146
-        Height = 36
+        Height = 40
         Top = 104
         Width = 208
@@ -206 +206 @@
       object ComboBoxMapShape: TComboBox
         Left = 146
-        Height = 36
+        Height = 40
         Top = 144
         Width = 208

trunk/Forms/UFormNew.pas

@@ -338 +338 @@
   SpinEditVoidPercent.Value := Game.VoidPercentage;
   SpinEditVoidPercent.Enabled := Game.VoidEnabled;
-  Players.Assign(Game.Players);
+  Players.Assign(Game.PlayersSetting);
   CheckBoxCity.Checked := Game.CityEnabled;
   SpinEditCityPercent.Value := Game.CityPercentage;
@@ -358 +358 @@
 procedure TFormNew.Save(Game: TGame);
 begin
-  Game.Players.Assign(Players);
-  Game.Players.NewPlayerId := Players.NewPlayerId;
+  Game.PlayersSetting.Assign(Players);
   Game.SymetricMap := CheckBoxSymetricMap.Checked;
   Game.VoidEnabled := CheckBoxVoid.Checked;

trunk/UCore.pas

@@ -460 +460 @@
     FInitialized := True;
 
+    // Update translated default player names
+    TPlayer(Game.PlayersSetting[0]).Name := SPlayer + ' 1';
+    TPlayer(Game.PlayersSetting[1]).Name := SPlayer + ' 2';
+
     LoadConfig;
     Game.LoadConfig(XMLConfig1, 'Game');
 
-    // Update translated default player names
-    TPlayer(Game.Players[0]).Name := SPlayer + ' 1';
-    TPlayer(Game.Players[1]).Name := SPlayer + ' 2';
-
     CommandLineParams;
     ScaleDPI;

trunk/UGame.pas

@@ -444 +444 @@
     procedure CalculatePlayersDistance;
     procedure PropagatePlayerDistance(List: TCells);
-    procedure InitDefaultPlayers;
+    procedure InitDefaultPlayersSetting;
   public
     Players: TPlayers;
+    PlayersSetting: TPlayers;
     Clients: TClients;
     Map: TMap;
@@ -3084 +3085 @@
 end;
 
-procedure TGame.InitDefaultPlayers;
-begin
-  Players.Clear;
-  Players.New(SPlayer + ' 1', clBlue, pmHuman);
-  Players.New(SPlayer + ' 2', clRed, pmComputer);
+procedure TGame.InitDefaultPlayersSetting;
+begin
+  PlayersSetting.Clear;
+  PlayersSetting.New(SPlayer + ' 1', clBlue, pmHuman);
+  PlayersSetting.New(SPlayer + ' 2', clRed, pmComputer);
 end;
 
@@ -3109 +3110 @@
     SetValue(DOMString(Path + '/GrowCells'), Integer(GrowCells));
     SetValue(DOMString(Path + '/WinObjective'), Integer(WinObjective));
-    Players.SaveConfig(Config, Path + '/Players');
+    PlayersSetting.SaveConfig(Config, Path + '/Players');
   end;
 end;
@@ -3141 +3142 @@
     if (Value >= Integer(Low(TWinObjective))) and (Value <= Integer(High(TWinObjective))) then
       WinObjective := TWinObjective(Value) else WinObjective := Low(TWinObjective);
-    Players.LoadConfig(Config, Path + '/Players');
+    PlayersSetting.LoadConfig(Config, Path + '/Players');
   end;
 end;
@@ -3367 +3368 @@
   Players := TPlayers.Create;
   Players.Game := Self;
+  PlayersSetting := TPlayers.Create;
+  PlayersSetting.Game := Self;
   Clients := TClients.Create;
   Clients.Game := Self;
@@ -3372 +3375 @@
   MapImageFileName := 'Images/Maps/WorldMap.png';
   Randomize;
+  InitDefaultPlayersSetting;
 
   VoidEnabled := True;
@@ -3384 +3388 @@
 begin
   FreeAndNil(Clients);
+  FreeAndNil(PlayersSetting);
   FreeAndNil(Players);
   FreeAndNil(Map);
@@ -3430 +3435 @@
   end;
 
-  InitDefaultPlayers;
+  Players.Assign(PlayersSetting);
   for Player in Players do Player.StartCell := nil;
   I := 0;