Changeset 176 for trunk/UGame.pas

Timestamp:

Jan 30, 2018, 6:36:50 PM (6 years ago)

Author:

chronos

Message:

• Modified: Clients moved to TServer class.

Location:

trunk

Files:

• . (modified) (1 prop)
• UGame.pas (modified) (15 diffs)

trunk

@@ -8 +8 @@
 backup
 xtactics.exe
+*.lrj

@@ -8 +8 @@
 backup
 xtactics.exe
+*.lrj

trunk/UGame.pas

@@ -30 +30 @@
   TMapArea = class;
   TClient = class;
+  TServer = class;
 
   TTerrainType = (ttVoid, ttNormal, ttCity);
@@ -430 +431 @@
     Game: TGame;
     procedure New(Name: string);
+    constructor Create(FreeObjects: Boolean = True);
   end;
 
@@ -460 +462 @@
     procedure SetRunning(AValue: Boolean);
     procedure BuildTerrain;
-    procedure InitClients;
     procedure SelectPlayerStartCell(Player: TPlayer);
     procedure CalculatePlayersDistance;
@@ -466 +467 @@
     procedure InitDefaultPlayersSetting;
   public
+    Server: TServer;
     DevelMode: Boolean;
     Players: TPlayers;
     PlayersSetting: TPlayers;
-    Clients: TClients;
     Map: TMap;
     MapImageFileName: string;
@@ -511 +512 @@
   end;
 
+  { TServer }
+
+  TServer = class
+  private
+    FGame: TGame;
+    procedure SetGame(AValue: TGame);
+  public
+    Clients: TClients;
+    procedure InitClients;
+    procedure Clear;
+    constructor Create;
+    destructor Destroy; override;
+    property Game: TGame read FGame write SetGame;
+  end;
+
 var
   PlayerModeText: array[TPlayerMode] of string;
@@ -617 +633 @@
   NewClient.Name := Name;
   Add(NewClient);
+end;
+
+constructor TClients.Create(FreeObjects: Boolean = True);
+begin
+  Game := nil;
+  inherited;
 end;
 
@@ -2906 +2928 @@
   end else begin
     FRunning := AValue;
-    for I := 0 to Clients.Count - 1 do
-    with TClient(Clients[I]) do begin
+    for I := 0 to Server.Clients.Count - 1 do
+    with TClient(Server.Clients[I]) do begin
       View.Clear;
     end;
@@ -3098 +3120 @@
 end;
 
-procedure TGame.InitClients;
+procedure TServer.SetGame(AValue: TGame);
+var
+  I: Integer;
+begin
+  if FGame = AValue then Exit;
+  FGame := AValue;
+  for I := 0 to Clients.Count - 1 do
+    Clients[I].Game := FGame;
+  Clients.Game := Game;
+end;
+
+procedure TServer.InitClients;
 var
   Client: TClient;
@@ -3106 +3139 @@
   Clients.New('Spectator');
 
-  for Player in Players do
+  for Player in Game.Players do
   with Player do
   if Mode = pmHuman then begin
@@ -3121 +3154 @@
       else View.CenterMap;
   end;
+end;
+
+procedure TServer.Clear;
+begin
+  Clients.Clear;
+  Game.Clear;
+end;
+
+constructor TServer.Create;
+begin
+  FGame := nil;
+  Clients := TClients.Create;
+end;
+
+destructor TServer.Destroy;
+begin
+  FreeAndNil(Clients);
+  inherited Destroy;
 end;
 
@@ -3300 +3351 @@
         else CurrentPlayer := nil;
 
-      InitClients;
       Map.Cells.FixRefId;
 
@@ -3484 +3534 @@
   PlayersSetting := TPlayers.Create;
   PlayersSetting.Game := Self;
-  Clients := TClients.Create;
-  Clients.Game := Self;
 
   MapImageFileName := 'Images/Maps/WorldMap.png';
@@ -3501 +3549 @@
 destructor TGame.Destroy;
 begin
-  FreeAndNil(Clients);
   FreeAndNil(PlayersSetting);
   FreeAndNil(Players);
@@ -3510 +3557 @@
 procedure TGame.Clear;
 begin
-  Clients.Clear;
   Players.Clear;
   Map.Clear;
@@ -3558 +3604 @@
     else CurrentPlayer := nil;
 
-  InitClients;
   ComputePlayerStats;
 end;

@@ -8 +8 @@
 backup
 xtactics.exe
+*.lrj