Changeset 231 for trunk/Forms

Timestamp:

Sep 19, 2018, 2:05:52 PM (6 years ago)

Author:

chronos

Message:

• Modified: UGame unit was split to UPlayer, UMap and UClientGUI units to have better logical separation of game classes.
• Modified: Drawing methods moved from TMap and TPlayerMap to TClientGUI. Generic TClient class and TComputer classes don't need have any drawing support.

Location:

trunk/Forms

Files:

• UFormCharts.pas (modified) (1 diff)
• UFormClient.pas (modified) (8 diffs)
• UFormNew.pas (modified) (1 diff)
• UFormPlayer.pas (modified) (1 diff)
• UFormPlayersStats.pas (modified) (1 diff)
• UFormUnitMoves.pas (modified) (1 diff)

trunk/Forms/UFormCharts.pas

@@ -34 +34 @@
 
 uses
-  UCore, UGame;
+  UCore, UGame, UPlayer;
 
 resourcestring

trunk/Forms/UFormClient.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM,
-  UGeometry, UGameClient, UGameProtocol, UThreading;
+  UGeometry, UGameClient, UGameProtocol, UThreading, UPlayer, UClientGUI;
 
 const
@@ -69 +69 @@
     procedure Timer1Timer(Sender: TObject);
   private
-    FClient: TClient;
+    FClient: TClientGUI;
     TempBitmap: TBitmap;
     StartMousePoint: TPoint;
@@ -80 +80 @@
     TimerPeriod: TDateTime;
     TurnActive: Boolean;
-    procedure SetClient(AValue: TClient);
+    procedure SetClient(AValue: TClientGUI);
     procedure DoClientChange(Sender: TObject);
     procedure DoGameEnd(Sender: TObject);
@@ -94 +94 @@
     procedure UpdateInterface;
     procedure Redraw;
-    property Client: TClient read FClient write SetClient;
+    property Client: TClientGUI read FClient write SetClient;
   end;
 
@@ -178 +178 @@
       TempBitmap.Canvas.Brush.Color := BackGroundColor; //clBackground; //PaintBox1.GetColorResolvingParent;
       TempBitmap.Canvas.FillRect(0, 0, PaintBox1.Width, PaintBox1.Height);
-      if Assigned(ControlPlayer) then ControlPlayer.Paint(TempBitmap.Canvas, View)
-        else Core.Game.Map.Paint(TempBitmap.Canvas, View);
+      Client.Paint(TempBitmap.Canvas, View);
       PaintBox1.Canvas.Draw(0, 0, TempBitmap);
     end else begin
@@ -186 +185 @@
       PaintBox1.Canvas.FillRect(0, 0, PaintBox1.Width, PaintBox1.Height);
       {$endif}
-      if Assigned(ControlPlayer) then ControlPlayer.Paint(PaintBox1.Canvas, View)
-        else Core.Game.Map.Paint(PaintBox1.Canvas, View);
+      Client.Paint(PaintBox1.Canvas, View)
     end;
   end;
@@ -227 +225 @@
 end;
 
-procedure TFormClient.SetClient(AValue: TClient);
+procedure TFormClient.SetClient(AValue: TClientGUI);
 begin
   if FClient = AValue then Exit;
@@ -474 +472 @@
     with Core.Game do
       if Assigned(Client.ControlPlayer) then
-        Cell := Client.ControlPlayer.PlayerMap.PosToCell(Client.View.CanvasToCellPos(TPoint.Create(X, Y)), Client.View);
+        Cell := Client.ControlPlayer.PlayerMap.PosToCell(Client.View.CanvasToCellPos(TPoint.Create(X, Y)));
         //else Cell := Client.Game.Map.PosToCell(Client.View.CanvasToCellPos(TPoint.Create(X, Y)), Client.View);
     if Assigned(Cell) then begin

trunk/Forms/UFormNew.pas

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

trunk/Forms/UFormPlayer.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ColorBox, Menus, Spin, UGame;
+  ColorBox, Menus, Spin, UGame, UPlayer;
 
 type

trunk/Forms/UFormPlayersStats.pas

@@ -39 +39 @@
 
 uses
-  UCore;
+  UCore, UPlayer;
 
 {$R *.lfm}

trunk/Forms/UFormUnitMoves.pas

@@ -29 +29 @@
 
 uses
-  UGame, UCore;
+  UGame, UCore, UPlayer;
 
 {$R *.lfm}