Changeset 184 for trunk

Timestamp:

Feb 12, 2018, 12:44:04 PM (7 years ago)

Author:

chronos

Message:

• Modified: Game server and client splitted to units separate from game classes.

Location:

trunk

Files:

• Forms/UFormChat.pas (modified) (1 diff)
• Forms/UFormClient.pas (modified) (1 diff)
• Forms/UFormNew.pas (modified) (1 diff)
• UCore.pas (modified) (6 diffs)
• UGame.pas (modified) (27 diffs)
• UGameClient.pas (added)
• UGameServer.pas (added)
• UGameSocket.pas (deleted)
• xtactics.lpi (modified) (2 diffs)
• xtactics.lpr (modified) (1 diff)

trunk/Forms/UFormChat.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, UGame;
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  UGame, UGameClient;
 
 type

trunk/Forms/UFormClient.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM,
-  UGeometry;
+  UGeometry, UGameClient;
 
 const

trunk/Forms/UFormNew.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame, UGeometry;
+  ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame, UGeometry,
+  UGameServer;
 
 type

trunk/UCore.pas

@@ -8 +8 @@
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
-  URegistry, ULastOpenedList, Registry, Menus, UGeometry, Contnrs, UFormClient;
+  URegistry, ULastOpenedList, Registry, Menus, UGeometry, Contnrs, UFormClient,
+  UGameServer, UGameClient;
 
 type
@@ -104 +105 @@
 
 uses
-  UFormMove, UFormMain, UFormNew, UFormSettings, UFormAbout,
+  UFormMain, UFormNew, UFormSettings, UFormAbout,
   UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats;
 
@@ -218 +219 @@
 begin
   FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then FormClient.Client := FirstHuman.Client
+  if Assigned(FirstHuman) then FormClient.Client := Server.Clients.SearchPlayer(FirstHuman)
     else FormClient.Client := TClient(Server.Clients.First);
 end;
@@ -380 +381 @@
   Game.OnNewTurn := GameNewTurnExecute;
   Game.OnPlayerChange := DoPlayerChange;
-  Game.Server := Server;
   Server.Game := Game;
   StoredDimension := TControlDimension.Create;
@@ -447 +447 @@
 begin
   Form := TFormClient.Create(nil);
-  Form.Client := Game.Server.Clients.New(SSpectator);
+  Form.Client := Server.Clients.New(SSpectator);
   //Form.Client.Form := Form;
   //Form.Client.ControlPlayer := Player;
@@ -470 +470 @@
 
 procedure TCore.DoPlayerChange(Sender: TObject);
-begin
-  if Assigned(Game.CurrentPlayer) and Assigned(Game.CurrentPlayer.Client) then begin
-    FormClient.Client := Game.CurrentPlayer.Client;
+var
+  PlayerClient: TClient;
+begin
+  if Assigned(Game.CurrentPlayer) then begin
+    PlayerClient := Server.Clients.SearchPlayer(Game.CurrentPlayer);
+    if Assigned(PlayerClient) then FormClient.Client := PlayerClient;
   end;
   UpdateOtherForms;

trunk/UGame.pas

@@ -8 +8 @@
   Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite, Forms,
   DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf, fgl,
-  UGeometry, UGameSocket;
+  UGeometry;
 
 const
@@ -29 +29 @@
   TCellLinks = class;
   TMapArea = class;
-  TClient = class;
-  TServer = class;
 
   TTerrainType = (ttVoid, ttNormal, ttCity);
@@ -292 +290 @@
   TUnitMove = class;
 
+  TMoveEvent = procedure(CellFrom, CellTo: TCell; var CountOnce, CountRepeat: Integer;
+    Update: Boolean; var Confirm: Boolean) of object;
+
   { TPlayer }
 
   TPlayer = class
   private
-    FClient: TClient;
     FGame: TGame;
     FMode: TPlayerMode;
-    procedure SetClient(AValue: TClient);
+    FOnMove: TMoveEvent;
     procedure SetGame(AValue: TGame);
     procedure Attack(var AttackPower, DefendPower: Integer);
@@ -337 +337 @@
     procedure SaveConfig(Config: TXmlConfig; Path: string);
     property Game: TGame read FGame write SetGame;
-    property Client: TClient read FClient write SetClient;
     property Mode: TPlayerMode read FMode write SetMode;
+    property OnMove: TMoveEvent read FOnMove write FOnMove;
   end;
 
@@ -415 +415 @@
   end;
 
-  TMoveEvent = procedure(CellFrom, CellTo: TCell; var CountOnce, CountRepeat: Integer;
-    Update: Boolean; var Confirm: Boolean) of object;
-
-  { TClient }
-
-  TClient = class
-  private
-    FForm: TForm;
-    FGame: TGame;
-    FControlPlayer: TPlayer;
-    FOnChange: TNotifyEvent;
-    FOnReceive: TReceiveEvent;
-    FOnMove: TMoveEvent;
-    procedure SetControlPlayer(AValue: TPlayer);
-    procedure SetForm(AValue: TForm);
-    procedure SetGame(AValue: TGame);
-    procedure DoChange;
-  public
-    Name: string;
-    View: TView;
-    GameSocket: TGameSocket;
-    procedure Send(Command: TCommand; DataOut, DataIn: Pointer);
-    constructor Create;
-    destructor Destroy; override;
-    property ControlPlayer: TPlayer read FControlPlayer write SetControlPlayer;
-    property Game: TGame read FGame write SetGame;
-    property Form: TForm read FForm write SetForm;
-    property OnMove: TMoveEvent read FOnMove write FOnMove;
-    property OnReceive: TReceiveEvent read FOnReceive write FOnReceive;
-    property OnChange: TNotifyEvent read FOnChange write FOnChange;
-  end;
-
-  { TClients }
-
-  TClients = class(TFPGObjectList<TClient>)
-    Game: TGame;
-    function New(Name: string): TClient;
-    constructor Create(FreeObjects: Boolean = True);
-  end;
-
-  { TGame }
-
   TMoveUpdatedEvent = procedure(UnitMove: TUnitMove) of object;
 
@@ -466 +424 @@
     woSpecialCaptureCell, woStayAliveForDefinedTurns);
 
+  { TGame }
+
   TGame = class
   private
     FMapType: TMapType;
+    FOnChange: TNotifyEvent;
     FOnMoveUpdated: TMoveUpdatedEvent;
     FOnNewTurn: TNotifyEvent;
     FOnPlayerChange: TNotifyEvent;
+    FOnStart: TNotifyEvent;
     FOnWin: TWinEvent;
     FRunning: Boolean;
@@ -485 +447 @@
     procedure InitDefaultPlayersSetting;
   public
-    Server: TServer;
     DevelMode: Boolean;
     Players: TPlayers;
@@ -527 +488 @@
     property OnNewTurn: TNotifyEvent read FOnNewTurn write FOnNewTurn;
     property OnPlayerChange: TNotifyEvent read FOnPlayerChange write FOnPlayerChange;
-  end;
-
-  TServerMode = (smLocal, smNetworkServer, smNetworkClient);
-
-  { TServer }
-
-  TServer = class
-  private
-    FActive: Boolean;
-    FGame: TGame;
-    FServerMode: TServerMode;
-    procedure SetActive(AValue: Boolean);
-    procedure SetGame(AValue: TGame);
-    procedure SetServerMode(AValue: TServerMode);
-    procedure DoChange;
-  public
-    Clients: TClients;
-    LocalNetworkAddress: string;
-    LocalNetworkPort: Word;
-    RemoteNetworkAddress: string;
-    RemoteNetworkPort: Word;
-    GameSocket: TGameSocket;
-    procedure LoadConfig(Config: TXmlConfig; Path: string);
-    procedure SaveConfig(Config: TXmlConfig; Path: string);
-    procedure InitClients;
-    procedure Clear;
-    constructor Create;
-    destructor Destroy; override;
-    property Game: TGame read FGame write SetGame;
-    property Mode: TServerMode read FServerMode write SetServerMode;
-    property Active: Boolean read FActive write SetActive;
+    property OnStart: TNotifyEvent read FOnStart write FOnStart;
+    property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
 
@@ -610 +542 @@
 end;
 
+function ComparePointer(const Item1, Item2: Integer): Integer;
+begin
+  Result := -CompareValue(Item1, Item2);
+end;
+
+
 { TGameTurnStat }
 
@@ -655 +593 @@
     TGameTurnStat(Items[I]).SaveToNode(NewNode);
   end;
-end;
-
-{ TClients }
-
-function TClients.New(Name: string): TClient;
-begin
-  Result := TClient.Create;
-  Result.Game := Game;
-  Result.Name := Name;
-  Add(Result);
-end;
-
-constructor TClients.Create(FreeObjects: Boolean = True);
-begin
-  Game := nil;
-  inherited;
-end;
-
-{ TClient }
-
-procedure TClient.SetGame(AValue: TGame);
-begin
-  if FGame = AValue then Exit;
-  FGame := AValue;
-  View.Game := AValue;
-end;
-
-procedure TClient.DoChange;
-begin
-  if Assigned(FOnChange) then
-    FOnChange(Self);
-end;
-
-procedure TClient.Send(Command: TCommand; DataOut, DataIn: Pointer);
-begin
-end;
-
-procedure TClient.SetControlPlayer(AValue: TPlayer);
-begin
-  if FControlPlayer = AValue then Exit;
-  if Assigned(FControlPlayer) then
-    FControlPlayer.FClient := nil;
-  FControlPlayer := AValue;
-  if Assigned(FControlPlayer) then
-     FControlPlayer.FClient := Self;
-end;
-
-procedure TClient.SetForm(AValue: TForm);
-begin
-  if FForm = AValue then Exit;
-  FForm := AValue;
-end;
-
-constructor TClient.Create;
-begin
-  View := TView.Create;
-end;
-
-destructor TClient.Destroy;
-begin
-  ControlPlayer := nil;
-  FreeAndNil(View);
-  inherited Destroy;
 end;
 
@@ -2162 +2037 @@
 end;
 
-{ TPlayer }
+{ TView }
 
 function TView.CanvasToCellPos(Pos: TPoint): TPoint;
@@ -2197 +2072 @@
 end;
 
+{ TPlayer }
+
 procedure TPlayer.SetGame(AValue: TGame);
 begin
@@ -2211 +2088 @@
 end;
 
-procedure TPlayer.SetClient(AValue: TClient);
-begin
-  if FClient=AValue then Exit;
+{procedure TPlayer.SetClient(AValue: TClient);
+begin
+  if FClient = AValue then Exit;
   if Assigned(FClient) then FClient.FControlPlayer := nil;
   FClient := AValue;
   if Assigned(FClient) then FClient.FControlPlayer := Self;
 end;
+}
 
 procedure TPlayer.LoadFromNode(Node: TDOMNode);
@@ -2279 +2157 @@
 end;
 
+procedure TPlayer.Paint(Canvas: TCanvas; View: TView);
+begin
+  PlayerMap.Paint(Canvas, View);
+end;
+
+constructor TPlayer.Create;
+begin
+  Moves := TUnitMoves.Create;
+  StartUnits := DefaultPlayerStartUnits;
+  StartCell := nil;
+  PlayerMap := TPlayerMap.Create;
+  PlayerMap.Player := Self;
+  TurnStats := TGameTurnStats.Create;
+  Computer := TComputer.Create;
+  Computer.Player := Self;
+end;
+
+destructor TPlayer.Destroy;
+begin
+  //Client := nil;
+  FreeAndNil(Computer);
+  FreeAndNil(TurnStats);
+  FreeAndNil(PlayerMap);
+  FreeAndNil(Moves);
+  inherited Destroy;
+end;
+
+procedure TPlayer.Assign(Source: TPlayer);
+begin
+  Id := Source.Id;
+  Name := Source.Name;
+  Color := Source.Color;
+  Mode := Source.Mode;
+  Game := Source.Game;
+  TotalCells := Source.TotalCells;
+  TotalUnits := Source.TotalUnits;
+  StartUnits := Source.StartUnits;
+  StartCell := Source.StartCell;
+  Agressivity := Source.Agressivity;
+  Defensive := Source.Defensive;
+  Computer.Game := Source.Computer.Game;
+  Computer.CellProcessDirection := Source.Computer.CellProcessDirection;
+end;
+
+procedure TPlayer.LoadConfig(Config: TXmlConfig; Path: string);
+begin
+  with Config do begin
+    Self.Name := string(GetValue(DOMString(Path + '/Name'), ''));
+    Color := TColor(GetValue(DOMString(Path + '/Color'), 0));
+    StartUnits := GetValue(DOMString(Path + '/StartUnits'), 5);
+    Mode := TPlayerMode(GetValue(DOMString(Path + '/Mode'), 0));
+    Defensive := GetValue(DOMString(Path + '/Defensive'), False);
+    Agressivity := TComputerAgressivity(GetValue(DOMString(Path + '/Agressivity'), 0));
+  end;
+end;
+
+procedure TPlayer.SaveConfig(Config: TXmlConfig; Path: string);
+begin
+  with Config do begin
+    SetValue(DOMString(Path + '/Name'), DOMString(Self.Name));
+    SetValue(DOMString(Path + '/Color'), Integer(Color));
+    SetValue(DOMString(Path + '/StartUnits'), StartUnits);
+    SetValue(DOMString(Path + '/Mode'), Integer(Mode));
+    SetValue(DOMString(Path + '/Defensive'), Defensive);
+    SetValue(DOMString(Path + '/Agressivity'), Integer(Agressivity));
+  end;
+end;
+
+procedure TPlayer.Attack(var AttackPower, DefendPower: Integer);
+var
+  AttackerDiceCount: Integer;
+  DefenderDiceCount: Integer;
+  S: string;
+  I: Integer;
+  AttackRolls: TFPGList<Integer>;
+  DefendRolls: TFPGList<Integer>;
+begin
+  AttackRolls := TFPGList<Integer>.Create;
+  DefendRolls := TFPGList<Integer>.Create;
+  if AttackPower < 1 then
+    raise Exception.Create(SAttackerPowerPositive);
+  if DefendPower < 0 then
+    raise Exception.Create(SDefenderPowerPositive);
+  while (AttackPower > 0) and (DefendPower > 0) do begin
+    // Risk game rules:
+    // Each side do their dice roll and compare result. Defender wins tie.
+    // Attacker can use three dices and defender two
+    AttackerDiceCount := Min(AttackPower, 3);
+    DefenderDiceCount := Min(DefendPower, 2);
+    // Roll and sort numbers
+    AttackRolls.Count := AttackerDiceCount;
+    for I := 0 to AttackerDiceCount - 1 do begin
+      AttackRolls[I] := Random(7);
+    end;
+    AttackRolls.Sort(ComparePointer);
+    S := 'Att:';
+    for I := 0 to AttackerDiceCount - 1 do
+      S := S + IntToStr(Integer(AttackRolls[I])) + ', ';
+    DefendRolls.Count := DefenderDiceCount;
+    for I := 0 to DefenderDiceCount - 1 do begin
+      DefendRolls[I] := Random(7);
+    end;
+    DefendRolls.Sort(ComparePointer);
+    S := S + ' Def:';
+    for I := 0 to DefenderDiceCount - 1 do
+      S := S + IntToStr(Integer(DefendRolls[I])) + ', ';
+    // Resolution
+    for I := 0 to Min(AttackerDiceCount, DefenderDiceCount) - 1 do
+      if AttackRolls[I] > DefendRolls[I] then Dec(DefendPower)
+      else Dec(AttackPower);
+  end;
+  FreeAndNil(AttackRolls);
+  FreeAndNil(DefendRolls);
+end;
+
 function CellCompare(const Item1, Item2: TCell): Integer;
 begin
@@ -2292 +2285 @@
   else Result := 0;
 end;
+
+{ TComputer }
 
 procedure TComputer.AttackNeutral;
@@ -2365 +2360 @@
   NeighborCell: TCell;
 begin
-  if Game.CurrentPlayer.Defensive then Exit;
+  if Player.Defensive then Exit;
 
   AllCells := Game.Map.Cells;
@@ -2590 +2585 @@
   end;
 end;
+
+{ TView }
 
 procedure TView.SelectCell(Pos: TPoint; Player: TPlayer; ShiftState: TShiftState);
@@ -2650 +2647 @@
 end;
 
-procedure TPlayer.Paint(Canvas: TCanvas; View: TView);
-begin
-  PlayerMap.Paint(Canvas, View);
-end;
-
-constructor TPlayer.Create;
-begin
-  Moves := TUnitMoves.Create;
-  StartUnits := DefaultPlayerStartUnits;
-  StartCell := nil;
-  PlayerMap := TPlayerMap.Create;
-  PlayerMap.Player := Self;
-  TurnStats := TGameTurnStats.Create;
-  Computer := TComputer.Create;
-  Computer.Player := Self;
-end;
-
-destructor TPlayer.Destroy;
-begin
-  Client := nil;
-  FreeAndNil(Computer);
-  FreeAndNil(TurnStats);
-  FreeAndNil(PlayerMap);
-  FreeAndNil(Moves);
-  inherited Destroy;
-end;
-
-procedure TPlayer.Assign(Source: TPlayer);
-begin
-  Id := Source.Id;
-  Name := Source.Name;
-  Color := Source.Color;
-  Mode := Source.Mode;
-  Game := Source.Game;
-  TotalCells := Source.TotalCells;
-  TotalUnits := Source.TotalUnits;
-  StartUnits := Source.StartUnits;
-  StartCell := Source.StartCell;
-  Agressivity := Source.Agressivity;
-  Defensive := Source.Defensive;
-  Computer.Game := Source.Computer.Game;
-  Computer.CellProcessDirection := Source.Computer.CellProcessDirection;
-end;
-
-procedure TPlayer.LoadConfig(Config: TXmlConfig; Path: string);
-begin
-  with Config do begin
-    Self.Name := string(GetValue(DOMString(Path + '/Name'), ''));
-    Color := TColor(GetValue(DOMString(Path + '/Color'), 0));
-    StartUnits := GetValue(DOMString(Path + '/StartUnits'), 5);
-    Mode := TPlayerMode(GetValue(DOMString(Path + '/Mode'), 0));
-    Defensive := GetValue(DOMString(Path + '/Defensive'), False);
-    Agressivity := TComputerAgressivity(GetValue(DOMString(Path + '/Agressivity'), 0));
-  end;
-end;
-
-procedure TPlayer.SaveConfig(Config: TXmlConfig; Path: string);
-begin
-  with Config do begin
-    SetValue(DOMString(Path + '/Name'), DOMString(Self.Name));
-    SetValue(DOMString(Path + '/Color'), Integer(Color));
-    SetValue(DOMString(Path + '/StartUnits'), StartUnits);
-    SetValue(DOMString(Path + '/Mode'), Integer(Mode));
-    SetValue(DOMString(Path + '/Defensive'), Defensive);
-    SetValue(DOMString(Path + '/Agressivity'), Integer(Agressivity));
-  end;
-end;
-
 { TGame }
-
-function ComparePointer(const Item1, Item2: Integer): Integer;
-begin
-  Result := -CompareValue(Item1, Item2);
-end;
-
-procedure TPlayer.Attack(var AttackPower, DefendPower: Integer);
-var
-  AttackerDiceCount: Integer;
-  DefenderDiceCount: Integer;
-  S: string;
-  I: Integer;
-  AttackRolls: TFPGList<Integer>;
-  DefendRolls: TFPGList<Integer>;
-begin
-  AttackRolls := TFPGList<Integer>.Create;
-  DefendRolls := TFPGList<Integer>.Create;
-  if AttackPower < 1 then
-    raise Exception.Create(SAttackerPowerPositive);
-  if DefendPower < 0 then
-    raise Exception.Create(SDefenderPowerPositive);
-  while (AttackPower > 0) and (DefendPower > 0) do begin
-    // Risk game rules:
-    // Each side do their dice roll and compare result. Defender wins tie.
-    // Attacker can use three dices and defender two
-    AttackerDiceCount := Min(AttackPower, 3);
-    DefenderDiceCount := Min(DefendPower, 2);
-    // Roll and sort numbers
-    AttackRolls.Count := AttackerDiceCount;
-    for I := 0 to AttackerDiceCount - 1 do begin
-      AttackRolls[I] := Random(7);
-    end;
-    AttackRolls.Sort(ComparePointer);
-    S := 'Att:';
-    for I := 0 to AttackerDiceCount - 1 do
-      S := S + IntToStr(Integer(AttackRolls[I])) + ', ';
-    DefendRolls.Count := DefenderDiceCount;
-    for I := 0 to DefenderDiceCount - 1 do begin
-      DefendRolls[I] := Random(7);
-    end;
-    DefendRolls.Sort(ComparePointer);
-    S := S + ' Def:';
-    for I := 0 to DefenderDiceCount - 1 do
-      S := S + IntToStr(Integer(DefendRolls[I])) + ', ';
-    // Resolution
-    for I := 0 to Min(AttackerDiceCount, DefenderDiceCount) - 1 do
-      if AttackRolls[I] > DefendRolls[I] then Dec(DefendPower)
-      else Dec(AttackPower);
-  end;
-  FreeAndNil(AttackRolls);
-  FreeAndNil(DefendRolls);
-end;
-
-function TGame.AttackProbability(AttackCount, DefendCount: Integer): Double;
-var
-  OA, OD: Integer;
-  Len: Integer;
-  I: Integer;
-begin
-  if AttackCount = 0 then begin
-    Result := 0;
-    Exit;
-  end;
-  if DefendCount = 0 then begin
-    Result := 1;
-    Exit;
-  end;
-
-  // Enlarge probability cache table on demand
-  if Length(ProbabilityMatrix) < AttackCount then begin
-    SetLength(ProbabilityMatrix, AttackCount);
-  end;
-  if Length(ProbabilityMatrix[AttackCount - 1]) < DefendCount then begin
-    Len := Length(ProbabilityMatrix[AttackCount - 1]);
-    SetLength(ProbabilityMatrix[AttackCount - 1], DefendCount);
-    for I := Len to Length(ProbabilityMatrix[AttackCount - 1]) - 1 do
-      ProbabilityMatrix[AttackCount - 1][I] := -1;
-  end;
-
-  if ProbabilityMatrix[AttackCount - 1, DefendCount - 1] <> -1 then begin
-    // Use cached value
-    Result := ProbabilityMatrix[AttackCount - 1, DefendCount - 1];
-    Exit;
-  end else Result := 1;
-
-  OA := Min(AttackCount, 3);
-  OD := Min(DefendCount, 2);
-
-  if (OA = 1) and (OD = 1) then
-    Result := 0.4167 * AttackProbability(AttackCount, DefendCount - 1) +
-      0.5833 * AttackProbability(AttackCount - 1, DefendCount)
-  else if (OA = 2) and (OD = 1) then
-    Result := 0.5787 * AttackProbability(AttackCount, DefendCount - 1) +
-      0.4213 * AttackProbability(AttackCount - 1, DefendCount)
-  else if (OA = 3) and (OD = 1) then
-    Result := 0.6597 * AttackProbability(AttackCount, DefendCount - 1) +
-      0.3403 * AttackProbability(AttackCount - 1, DefendCount)
-  else if (OA = 1) and (OD = 2) then
-    Result := 0.2546 * AttackProbability(AttackCount, DefendCount - 1) +
-      0.7454 * AttackProbability(AttackCount - 1, DefendCount)
-  else if (OA = 2) and (OD = 2) then
-    Result := 0.2276 * AttackProbability(AttackCount, DefendCount - 2) +
-      0.4483 * AttackProbability(AttackCount - 2, DefendCount) +
-      0.3241 * AttackProbability(AttackCount - 1, DefendCount - 1)
-  else if (OA = 3) and (OD = 2) then
-    Result := 0.3717 * AttackProbability(AttackCount, DefendCount - 2) +
-      0.2926 * AttackProbability(AttackCount - 2, DefendCount) +
-      0.3358 * AttackProbability(AttackCount - 1, DefendCount - 1);
-  ProbabilityMatrix[AttackCount - 1, DefendCount - 1] := Result;
-end;
 
 procedure TPlayer.MoveAll;
@@ -2897 +2716 @@
 end;
 
-procedure TGame.SetMapType(AValue: TMapType);
-var
-  OldMap: TMap;
-begin
-  if FMapType = AValue then Exit;
-  OldMap := Map;
-  case AValue of
-    mtNone: Map := TMap.Create;
-    mtHexagon: Map := THexMap.Create;
-    mtSquare: Map := TSquareMap.Create;
-    mtTriangle: Map := TTriangleMap.Create;
-    mtVoronoi: Map := TVoronoiMap.Create;
-    else Map := TMap.Create;
-  end;
-  Map.Assign(OldMap);
-  FreeAndNil(OldMap);
-  FMapType := AValue;
-end;
-
 function TPlayer.SetMove(CellFrom, CellTo: TCell; Power: Integer; Confirmation: Boolean = True): TUnitMove;
 var
@@ -2930 +2730 @@
     CountRepeat := Result.CountRepeat;
     if (Mode = pmHuman) and Confirmation and
-      Assigned(Client) and Assigned(Client.FOnMove) then
-        Client.FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True, Confirm);
+      Assigned(FOnMove) then
+        FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True, Confirm);
   end else begin
     CountOnce := Power;
     CountRepeat := 0;
     if (Mode = pmHuman) and Confirmation and
-      Assigned(Client) and Assigned(Client.FOnMove) then
-        Client.FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, False, Confirm);
+      Assigned(FOnMove) then
+        FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, False, Confirm);
   end;
   if Confirm then begin
@@ -2968 +2768 @@
 end;
 
-procedure TGame.SetRunning(AValue: Boolean);
-var
-  I: Integer;
-begin
-  if FRunning = AValue then Exit;
-  if AValue then begin
-    if Players.Count < 2 then raise Exception.Create(SMinimumPlayers);
-    FRunning := AValue;
-  end else begin
-    FRunning := AValue;
-    for I := 0 to Server.Clients.Count - 1 do
-    with TClient(Server.Clients[I]) do begin
-      View.Clear;
-    end;
-  end;
-end;
-
 procedure TPlayer.UpdateRepeatMoves;
 var
@@ -3031 +2814 @@
   FMode := AValue;
 end;
+
+{ TMap }
 
 function TMap.SearchDifferentCellArea(List: TCells; SourceArea, DestArea: TMapArea): TCell;
@@ -3070 +2855 @@
   FreeAndNil(NewListVoid);
   FreeAndNil(NewList);
-end;
-
-procedure TGame.BuildTerrain;
-var
-  Cell: TCell;
-begin
-  if (Map.Shape = msImage) and FileExists(MapImageFileName) and
-  (LoadedImageFileName <> MapImageFileName) then begin
-    LoadedImageFileName := MapImageFileName;
-    Map.Image.Picture.LoadFromFile(MapImageFileName);
-  end;
-
-  // Randomize map terrain
-  for Cell in Map.Cells do
-  with Cell do begin
-    if (VoidEnabled and (Random < VoidPercentage / 100)) or
-    (Map.IsOutsideShape(PosPx)) then Terrain := ttVoid
-      else begin
-        if CityEnabled and (Random < CityPercentage / 100) then Terrain := ttCity
-          else Terrain := ttNormal;
-      end;
-    Power := Random(MaxNeutralUnits + 1);
-    Player := nil;
-  end;
 end;
 
@@ -3170 +2931 @@
 end;
 
-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.SetActive(AValue: Boolean);
-begin
-  if FActive = AValue then Exit;
-  FActive := AValue;
-end;
-
-procedure TServer.SetServerMode(AValue: TServerMode);
-var
-  LastActiveState: Boolean;
-begin
-  if FServerMode = AValue then Exit;
-  LastActiveState := Active;
-  Active := False;
-  FServerMode := AValue;
-  FreeAndNil(GameSocket);
-  case FServerMode of
-    smLocal: GameSocket := TGameSocketDirect.Create;
-    smNetworkServer: begin
-      GameSocket := TGameSocketNetworkServer.Create;
-      TGameSocketNetworkServer(GameSocket).TCPServer.Address := LocalNetworkAddress;
-      TGameSocketNetworkServer(GameSocket).TCPServer.Port := LocalNetworkPort;
-      //TODO TGameSocketNetworkServer(GameSocket).TCPServer.Active := True;
-    end;
-    smNetworkClient: begin
-      GameSocket := TGameSocketNetworkClient.Create;
-      if (LocalNetworkAddress = RemoteNetworkAddress) and
-        (LocalNetworkPort = RemoteNetworkPort) then begin
-          // User wants to play on its own server
-          GameSocket := TGameSocketNetworkServer.Create;
-          TGameSocketNetworkServer(GameSocket).TCPServer.Address := LocalNetworkAddress;
-          TGameSocketNetworkServer(GameSocket).TCPServer.Port := LocalNetworkPort;
-          //TODO TGameSocketNetworkServer(GameSocket).TCPServer.Active := True;
-        end else
-        begin
-          // Do not create socket. User wants to connect elsewhere
-        end;
+procedure TMap.Paint(Canvas: TCanvas; View: TView);
+var
+  I: Integer;
+  Cell: TCell;
+  PosFrom, PosTo: TPoint;
+  Angle: Double;
+  ArrowCenter: TPoint;
+  Move: TUnitMove;
+  CellLink: TCellLink;
+begin
+  with Canvas, View do
+  try
+    Lock;
+
+    // Draw cell links
+    Pen.Color := clBlack;
+    Pen.Style := psSolid;
+    Pen.Width := 3;
+    for CellLink in CellLinks do
+    with CellLink do begin
+      if Length(Points) >= 2 then begin
+        MoveTo(PointToStdPoint(View.CellToCanvasPos(Points[0])));
+        for I := 1 to Length(Points) - 1 do
+          LineTo(PointToStdPoint(View.CellToCanvasPos(Points[I])));
       end;
-  end;
-  Active := LastActiveState;
-end;
-
-procedure TServer.DoChange;
-var
-  Client: TClient;
-begin
-  for Client in Clients do
-    Client.DoChange;
-end;
-
-procedure TServer.LoadConfig(Config: TXmlConfig; Path: string);
-begin
-  with Config do begin
-    LocalNetworkAddress := string(GetValue(DOMString(Path + '/LocalNetworkAddress'), 'localhost'));
-    LocalNetworkPort := GetValue(DOMString(Path + '/LocalNetworkPort'), 40009);
-    RemoteNetworkAddress := string(GetValue(DOMString(Path + '/RemoteNetworkAddress'), 'localhost'));
-    RemoteNetworkPort := GetValue(DOMString(Path + '/RemoteNetworkPort'), 40009);
-    Mode := TServerMode(GetValue(DOMString(Path + '/Mode'), Integer(smLocal)));
-  end;
-end;
-
-procedure TServer.SaveConfig(Config: TXmlConfig; Path: string);
-begin
-  with Config do begin
-    SetValue(DOMString(Path + '/LocalNetworkAddress'), DOMString(LocalNetworkAddress));
-    SetValue(DOMString(Path + '/LocalNetworkPort'), LocalNetworkPort);
-    SetValue(DOMString(Path + '/RemoteNetworkAddress'), DOMString(RemoteNetworkAddress));
-    SetValue(DOMString(Path + '/RemoteNetworkPort'), RemoteNetworkPort);
-    SetValue(DOMString(Path + '/Mode'), Integer(Mode));
-  end;
-end;
-
-procedure TServer.InitClients;
-var
-  Client: TClient;
-  Player: TPlayer;
-begin
-  Clients.Clear;
-  Clients.New(SSpectator);
-
-  for Player in Game.Players do
-  with Player do
-  if Mode = pmHuman then begin
-    Player.Client := Clients.New(Player.Name);
-  end;
-
-  for Client in Clients do
-  with Client do begin
-    View.Clear;
-    View.Zoom := 1;
-    if Assigned(ControlPlayer) and Assigned(ControlPlayer.StartCell) then
-      View.CenterPlayerCity(ControlPlayer)
-      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;
+
+    // Draw cells
+    for Cell in Cells do begin
+      if (Cell.Terrain <> ttVoid) and Cell.IsVisible(View) then begin
+        if Assigned(SelectedCell) and (SelectedCell = Cell) then
+            Brush.Color := clGreen
+          else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, Cell) then
+            Brush.Color := clPurple
+          else Brush.Color := Cell.GetColor;
+        //Pen.Color := clBlack;
+        PaintCell(Canvas, Cell.PosPx, IntToStr(Cell.GetAvialPower), View, Cell);
+      end;
+
+    end;
+
+    // Draw arrows
+    Pen.Color := clCream;
+    for Move in Game.CurrentPlayer.Moves do begin
+      PosFrom := CellToPos(Move.CellFrom);
+      PosTo := CellToPos(Move.CellTo);
+      if Move.CountRepeat > 0 then Pen.Width := 2
+        else Pen.Width := 1;
+      Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
+      if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
+      ArrowCenter := View.CellToCanvasPos(TPoint.Create(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
+        Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)));
+      DrawArrow(Canvas, View, ArrowCenter,
+        Angle, IntToStr(Move.CountOnce));
+    end;
+  finally
+    Unlock;
+  end;
+end;
+
+{ TGame }
+
+function TGame.AttackProbability(AttackCount, DefendCount: Integer): Double;
+var
+  OA, OD: Integer;
+  Len: Integer;
+  I: Integer;
+begin
+  if AttackCount = 0 then begin
+    Result := 0;
+    Exit;
+  end;
+  if DefendCount = 0 then begin
+    Result := 1;
+    Exit;
+  end;
+
+  // Enlarge probability cache table on demand
+  if Length(ProbabilityMatrix) < AttackCount then begin
+    SetLength(ProbabilityMatrix, AttackCount);
+  end;
+  if Length(ProbabilityMatrix[AttackCount - 1]) < DefendCount then begin
+    Len := Length(ProbabilityMatrix[AttackCount - 1]);
+    SetLength(ProbabilityMatrix[AttackCount - 1], DefendCount);
+    for I := Len to Length(ProbabilityMatrix[AttackCount - 1]) - 1 do
+      ProbabilityMatrix[AttackCount - 1][I] := -1;
+  end;
+
+  if ProbabilityMatrix[AttackCount - 1, DefendCount - 1] <> -1 then begin
+    // Use cached value
+    Result := ProbabilityMatrix[AttackCount - 1, DefendCount - 1];
+    Exit;
+  end else Result := 1;
+
+  OA := Min(AttackCount, 3);
+  OD := Min(DefendCount, 2);
+
+  if (OA = 1) and (OD = 1) then
+    Result := 0.4167 * AttackProbability(AttackCount, DefendCount - 1) +
+      0.5833 * AttackProbability(AttackCount - 1, DefendCount)
+  else if (OA = 2) and (OD = 1) then
+    Result := 0.5787 * AttackProbability(AttackCount, DefendCount - 1) +
+      0.4213 * AttackProbability(AttackCount - 1, DefendCount)
+  else if (OA = 3) and (OD = 1) then
+    Result := 0.6597 * AttackProbability(AttackCount, DefendCount - 1) +
+      0.3403 * AttackProbability(AttackCount - 1, DefendCount)
+  else if (OA = 1) and (OD = 2) then
+    Result := 0.2546 * AttackProbability(AttackCount, DefendCount - 1) +
+      0.7454 * AttackProbability(AttackCount - 1, DefendCount)
+  else if (OA = 2) and (OD = 2) then
+    Result := 0.2276 * AttackProbability(AttackCount, DefendCount - 2) +
+      0.4483 * AttackProbability(AttackCount - 2, DefendCount) +
+      0.3241 * AttackProbability(AttackCount - 1, DefendCount - 1)
+  else if (OA = 3) and (OD = 2) then
+    Result := 0.3717 * AttackProbability(AttackCount, DefendCount - 2) +
+      0.2926 * AttackProbability(AttackCount - 2, DefendCount) +
+      0.3358 * AttackProbability(AttackCount - 1, DefendCount - 1);
+  ProbabilityMatrix[AttackCount - 1, DefendCount - 1] := Result;
+end;
+
+procedure TGame.SetMapType(AValue: TMapType);
+var
+  OldMap: TMap;
+begin
+  if FMapType = AValue then Exit;
+  OldMap := Map;
+  case AValue of
+    mtNone: Map := TMap.Create;
+    mtHexagon: Map := THexMap.Create;
+    mtSquare: Map := TSquareMap.Create;
+    mtTriangle: Map := TTriangleMap.Create;
+    mtVoronoi: Map := TVoronoiMap.Create;
+    else Map := TMap.Create;
+  end;
+  Map.Assign(OldMap);
+  FreeAndNil(OldMap);
+  FMapType := AValue;
+end;
+
+procedure TGame.SetRunning(AValue: Boolean);
+begin
+  if FRunning = AValue then Exit;
+  if AValue then begin
+    if Players.Count < 2 then raise Exception.Create(SMinimumPlayers);
+    FRunning := AValue;
+  end else begin
+    FRunning := AValue;
+    if Assigned(FOnStart) then FOnStart(Self);
+  end;
+end;
+
+procedure TGame.BuildTerrain;
+var
+  Cell: TCell;
+begin
+  if (Map.Shape = msImage) and FileExists(MapImageFileName) and
+  (LoadedImageFileName <> MapImageFileName) then begin
+    LoadedImageFileName := MapImageFileName;
+    Map.Image.Picture.LoadFromFile(MapImageFileName);
+  end;
+
+  // Randomize map terrain
+  for Cell in Map.Cells do
+  with Cell do begin
+    if (VoidEnabled and (Random < VoidPercentage / 100)) or
+    (Map.IsOutsideShape(PosPx)) then Terrain := ttVoid
+      else begin
+        if CityEnabled and (Random < CityPercentage / 100) then Terrain := ttCity
+          else Terrain := ttNormal;
+      end;
+    Power := Random(MaxNeutralUnits + 1);
+    Player := nil;
+  end;
 end;
 
@@ -3563 +3375 @@
 end;
 
-function TPlayers.GetAlivePlayers: TPlayerArray;
-var
-  Player: TPlayer;
-begin
-  SetLength(Result, 0);
-  for Player in Self do
-    if Player.IsAlive then begin
-      SetLength(Result, Length(Result) + 1);
-      Result[Length(Result) - 1] := Player;
-    end;
-end;
-
-function TPlayers.GetAlivePlayersWithCities: TPlayerArray;
-var
-  Player: TPlayer;
-begin
-  SetLength(Result, 0);
-  for Player in Self do
-    if Player.TotalCities > 0 then begin
-      SetLength(Result, Length(Result) + 1);
-      Result[Length(Result) - 1] := Player;
-    end;
-end;
-
 procedure TGame.NextTurn;
 var
@@ -3614 +3402 @@
   // For computers take view from previous human
   //if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);
-  Server.DoChange;
+  if Assigned(FOnChange) then
+    FOnChange(Self);
 end;
 
@@ -3734 +3523 @@
 end;
 
-procedure TMap.Paint(Canvas: TCanvas; View: TView);
-var
-  I: Integer;
-  Cell: TCell;
-  PosFrom, PosTo: TPoint;
-  Angle: Double;
-  ArrowCenter: TPoint;
-  Move: TUnitMove;
-  CellLink: TCellLink;
-begin
-  with Canvas, View do
-  try
-    Lock;
-
-    // Draw cell links
-    Pen.Color := clBlack;
-    Pen.Style := psSolid;
-    Pen.Width := 3;
-    for CellLink in CellLinks do
-    with CellLink do begin
-      if Length(Points) >= 2 then begin
-        MoveTo(PointToStdPoint(View.CellToCanvasPos(Points[0])));
-        for I := 1 to Length(Points) - 1 do
-          LineTo(PointToStdPoint(View.CellToCanvasPos(Points[I])));
-      end;
-    end;
-
-    // Draw cells
-    for Cell in Cells do begin
-      if (Cell.Terrain <> ttVoid) and Cell.IsVisible(View) then begin
-        if Assigned(SelectedCell) and (SelectedCell = Cell) then
-            Brush.Color := clGreen
-          else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell, Cell) then
-            Brush.Color := clPurple
-          else Brush.Color := Cell.GetColor;
-        //Pen.Color := clBlack;
-        PaintCell(Canvas, Cell.PosPx, IntToStr(Cell.GetAvialPower), View, Cell);
-      end;
-
-    end;
-
-    // Draw arrows
-    Pen.Color := clCream;
-    for Move in Game.CurrentPlayer.Moves do begin
-      PosFrom := CellToPos(Move.CellFrom);
-      PosTo := CellToPos(Move.CellTo);
-      if Move.CountRepeat > 0 then Pen.Width := 2
-        else Pen.Width := 1;
-      Angle := ArcTan((PosTo.Y - PosFrom.Y) / (PosTo.X - PosFrom.X));
-      if Sign(PosTo.X - PosFrom.X) = -1 then Angle := Angle + Pi;
-      ArrowCenter := View.CellToCanvasPos(TPoint.Create(Trunc(PosFrom.X + (PosTo.X - PosFrom.X) / 2),
-        Trunc(PosFrom.Y + (PosTo.Y - PosFrom.Y) / 2)));
-      DrawArrow(Canvas, View, ArrowCenter,
-        Angle, IntToStr(Move.CountOnce));
-    end;
-  finally
-    Unlock;
-  end;
+{ TPlayers }
+
+function TPlayers.GetAlivePlayers: TPlayerArray;
+var
+  Player: TPlayer;
+begin
+  SetLength(Result, 0);
+  for Player in Self do
+    if Player.IsAlive then begin
+      SetLength(Result, Length(Result) + 1);
+      Result[Length(Result) - 1] := Player;
+    end;
+end;
+
+function TPlayers.GetAlivePlayersWithCities: TPlayerArray;
+var
+  Player: TPlayer;
+begin
+  SetLength(Result, 0);
+  for Player in Self do
+    if Player.TotalCities > 0 then begin
+      SetLength(Result, Length(Result) + 1);
+      Result[Length(Result) - 1] := Player;
+    end;
 end;
 

trunk/xtactics.lpi

@@ -100 +100 @@
       </Item6>
     </RequiredPackages>
-    <Units Count="19">
+    <Units Count="20">
       <Unit0>
         <Filename Value="xtactics.lpr"/>
@@ -191 +191 @@
       </Unit13>
       <Unit14>
-        <Filename Value="UGameSocket.pas"/>
+        <Filename Value="UTCP.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit14>
       <Unit15>
-        <Filename Value="UTCP.pas"/>
+        <Filename Value="UServerList.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit15>
       <Unit16>
-        <Filename Value="UServerList.pas"/>
-        <IsPartOfProject Value="True"/>
+        <Filename Value="Forms/UFormClient.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormClient"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
       </Unit16>
       <Unit17>
-        <Filename Value="Forms/UFormClient.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormClient"/>
-        <HasResources Value="True"/>
+        <Filename Value="Forms/UFormPlayersStats.pas"/>
+        <IsPartOfProject Value="True"/>
+        <ComponentName Value="FormPlayersStats"/>
         <ResourceBaseClass Value="Form"/>
       </Unit17>
       <Unit18>
-        <Filename Value="Forms/UFormPlayersStats.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="FormPlayersStats"/>
-        <ResourceBaseClass Value="Form"/>
+        <Filename Value="UGameServer.pas"/>
+        <IsPartOfProject Value="True"/>
       </Unit18>
+      <Unit19>
+        <Filename Value="UGameClient.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit19>
     </Units>
   </ProjectOptions>

trunk/xtactics.lpr

@@ -12 +12 @@
   { you can add units after this },
   SysUtils, UFormMain, UFormMove, UFormNew, UFormCharts, UFormUnitMoves,
-  UFormChat, UGameSocket, UTCP, UServerList, UFormPlayersStats;
+  UFormChat, UTCP, UServerList, UFormPlayersStats, UGameServer, UGameClient;
 
 {$R *.res}