Changeset 199 for trunk/UGame.pas

Timestamp:

May 16, 2018, 2:48:57 PM (6 years ago)

Author:

chronos

Message:

• Modified: Initial game setting made independent to current game settings. So last game can be automatically loaded on start and initial setting will be intact.

File:

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

trunk/UGame.pas

@@ -329 +329 @@
     Moves: TUnitMoves;
     Computer: TComputer;
+    procedure Reset;
     function IsAlive: Boolean;
     procedure Clear;
@@ -442 +443 @@
     procedure CalculatePlayersDistance;
     procedure PropagatePlayerDistance(List: TCells);
-    procedure InitDefaultPlayersSetting;
+    procedure InitDefaultPlayers;
     procedure WinObjectiveMapPrepare;
   public
     DevelMode: Boolean;
     Players: TPlayers;
-    PlayersSetting: TPlayers;
     Map: TMap;
     MapImageFileName: string;
@@ -467 +467 @@
     BridgeEnabled: Boolean;
     MaxPower: Integer;
+    procedure Assign(Source: TGame);
     function AttackProbability(AttackCount, DefendCount: Integer): Double;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
@@ -2809 +2810 @@
 end;
 
+procedure TPlayer.Reset;
+begin
+  Moves.Clear;
+  PlayerMap.Cells.Clear;
+  TotalUnits := 0;
+  TotalCells := 0;
+  TotalCities := 0;
+  TotalDiscovered := 0;
+  TurnStats.Clear;
+  StartCell := nil;
+end;
+
 function TPlayer.IsAlive: Boolean;
 begin
@@ -3199 +3212 @@
 end;
 
-procedure TGame.InitDefaultPlayersSetting;
-begin
-  PlayersSetting.Clear;
-  PlayersSetting.New(SPlayer + ' 1', clBlue, pmHuman);
-  PlayersSetting.New(SPlayer + ' 2', clRed, pmComputer);
+procedure TGame.InitDefaultPlayers;
+begin
+  Players.Clear;
+  Players.New(SPlayer + ' 1', clBlue, pmHuman);
+  Players.New(SPlayer + ' 2', clRed, pmComputer);
 end;
 
@@ -3226 +3239 @@
     Cells.Free;
   end;
+end;
+
+procedure TGame.Assign(Source: TGame);
+begin
+  DevelMode := Source.DevelMode;
+  Players.Assign(Source.Players);
+  MapType := Source.MapType;
+  Map.Assign(Source.Map);
+  MapImageFileName := Source.MapImageFileName;
+  VoidEnabled := Source.VoidEnabled;
+  VoidPercentage := Source.VoidPercentage;
+  SymetricMap := Source.SymetricMap;
+  GrowCells := Source.GrowCells;
+  GrowAmount := Source.GrowAmount;
+  CityEnabled := Source.CityEnabled;
+  CityPercentage := Source.CityPercentage;
+  TurnCounter := Source.TurnCounter;
+  WinObjective := Source.WinObjective;
+  SpecialCaptureCellCount := Source.SpecialCaptureCellCount;
+  StayAliveForDefinedTurns := Source.StayAliveForDefinedTurns;
+  MaxNeutralUnits := Source.MaxNeutralUnits;
+  FileName := Source.FileName;
+  FogOfWar := Source.FogOfWar;
+  BridgeEnabled := Source.BridgeEnabled;
+  MaxPower := Source.MaxPower;
 end;
 
@@ -3248 +3286 @@
     SetValue(DOMString(Path + '/StayAliveForDefinedTurns'), StayAliveForDefinedTurns);
     SetValue(DOMString(Path + '/SpecialCaptureCellCount'), SpecialCaptureCellCount);
-    PlayersSetting.SaveConfig(Config, Path + '/Players');
+    Players.SaveConfig(Config, Path + '/Players');
   end;
 end;
@@ -3282 +3320 @@
     StayAliveForDefinedTurns := GetValue(DOMString(Path + '/StayAliveForDefinedTurns'), 20);
     SpecialCaptureCellCount := GetValue(DOMString(Path + '/SpecialCaptureCellCount'), 1);
-    PlayersSetting.LoadConfig(Config, Path + '/Players');
+    Players.LoadConfig(Config, Path + '/Players');
   end;
 end;
@@ -3499 +3537 @@
   Players := TPlayers.Create;
   Players.Game := Self;
-  PlayersSetting := TPlayers.Create;
-  PlayersSetting.Game := Self;
 
   MapImageFileName := 'Images/Maps/WorldMap.png';
   Randomize;
-  InitDefaultPlayersSetting;
+  InitDefaultPlayers;
 
   VoidEnabled := True;
@@ -3517 +3553 @@
 destructor TGame.Destroy;
 begin
-  FreeAndNil(PlayersSetting);
   FreeAndNil(Players);
   FreeAndNil(Map);
@@ -3524 +3559 @@
 
 procedure TGame.Clear;
-begin
-  Players.Clear;
+var
+  I: Integer;
+begin
+  for I := 0 to Players.Count - 1 do Players[I].Clear;
   Map.Clear;
 end;
@@ -3551 +3588 @@
   end;
 
-  Players.Assign(PlayersSetting);
   for Player in Players do Player.StartCell := nil;
   I := 0;