Changeset 176 for trunk

Timestamp:

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

Author:

chronos

Message:

• Modified: Clients moved to TServer class.

Location:

trunk

Files:

• . (modified) (1 prop)
• UCore.lfm (modified) (5 diffs)
• UCore.pas (modified) (7 diffs)
• UGame.pas (modified) (15 diffs)

trunk

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

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

trunk/UCore.lfm

@@ -3 +3 @@
   OnDestroy = DataModuleDestroy
   OldCreateOrder = False
-  Height = 542
-  HorizontalOffset = 565
-  VerticalOffset = 329
-  Width = 752
+  Height = 678
+  HorizontalOffset = 706
+  VerticalOffset = 352
+  Width = 940
+  PPI = 120
   object ActionList1: TActionList
     Images = ImageListSmall
-    left = 72
-    top = 32
+    left = 90
+    top = 40
     object AGameNew: TAction
       Caption = 'New'
@@ -84 +85 @@
   end
   object ImageListSmall: TImageList
-    left = 419
-    top = 224
+    left = 524
+    top = 280
     Bitmap = {
       4C690C00000010000000100000000000000000000000E3AA4BD6E5B35EFFE3B1
@@ -477 +478 @@
     POFilesFolder = 'Languages'
     OnTranslate = CoolTranslator1Translate
-    left = 73
-    top = 232
+    left = 91
+    top = 290
   end
   object ImageListLarge: TImageList
     Height = 32
     Width = 32
-    left = 419
-    top = 152
+    left = 524
+    top = 190
     Bitmap = {
       4C690C0000002000000020000000000000000000000000000000E2AA4B36E2A9
@@ -2029 +2030 @@
     RootName = 'CONFIG'
     ReadOnly = False
-    left = 73
-    top = 296
+    left = 91
+    top = 370
   end
   object OpenDialog1: TOpenDialog
     DefaultExt = '.xtmap'
-    left = 600
-    top = 155
+    left = 750
+    top = 194
   end
   object SaveDialog1: TSaveDialog
     DefaultExt = '.xtmap'
-    left = 600
-    top = 88
+    left = 750
+    top = 110
   end
   object ApplicationInfo: TApplicationInfo
@@ -2057 +2058 @@
     RegistryRoot = rrKeyCurrentUser
     License = 'CC0'
-    left = 73
-    top = 96
+    left = 91
+    top = 120
   end
   object PersistentForm: TPersistentForm
     MinVisiblePart = 50
     EntireVisible = False
-    left = 416
-    top = 320
+    left = 520
+    top = 400
   end
   object ScaleDPI1: TScaleDPI
     AutoDetect = False
-    left = 72
-    top = 360
+    left = 90
+    top = 450
   end
   object LastOpenedList1: TLastOpenedList
     MaxCount = 10
     OnChange = LastOpenedList1Change
-    left = 73
-    top = 160
+    left = 91
+    top = 200
   end
 end

trunk/UCore.pas

@@ -78 +78 @@
   public
     Game: TGame;
+    Server: TServer;
     UseSingleView: Boolean;
     DevelMode: Boolean;
@@ -247 +248 @@
   FirstHuman := Game.Players.GetFirstHuman;
   if Assigned(FirstHuman) then CurrentClient := FirstHuman.Client
-    else CurrentClient := TClient(Game.Clients.First);
+    else CurrentClient := TClient(Server.Clients.First);
 end;
 
@@ -384 +385 @@
 procedure TCore.DataModuleCreate(Sender: TObject);
 begin
+  Server := TServer.Create;
   Game := TGame.Create;
   Game.OnMove := DoOnMove;
@@ -390 +392 @@
   Game.OnNewTurn := GameNewTurnExecute;
   Game.OnPlayerChange := DoPlayerChange;
+  Game.Server := Server;
+  Server.Game := Game;
   StoredDimension := TControlDimension.Create;
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
@@ -400 +404 @@
   Game.SaveConfig(XMLConfig1, 'Game');
   SaveConfig;
+  FreeAndNil(Server);
   FreeAndNil(Game);
 end;
@@ -416 +421 @@
 begin
   Game.LoadFromFile(FileName);
+  Server.InitClients;
   SelectClient;
   LastOpenedList1.AddItem(FileName);
@@ -430 +436 @@
 begin
   Game.New;
+  Server.InitClients;
   Game.DevelMode := DevelMode;
   SelectClient;

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