Changeset 125 for trunk/Forms

Timestamp:

Jun 17, 2017, 2:24:51 AM (7 years ago)

Author:

chronos

Message:

• Modified: Introduced TClient class for real user accessing particular player or spectator. TPlayer is now just player in the game.
• Fixed: Exception if no human player was selected.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (11 diffs)
• UFormNew.pas (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -14 +14 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.4.0'
   WindowState = wsMaximized
   object StatusBar1: TStatusBar

trunk/Forms/UFormMain.pas

@@ -131 +131 @@
 begin
   DrawStart := Now;
-  if Assigned(Core.Player) then
-  with Core.Player do begin
+  if Assigned(Core.CurrentClient) then
+  with Core.CurrentClient do begin
     View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
     if csOpaque in PaintBox1.ControlStyle then begin
@@ -138 +138 @@
       TempBitmap.Canvas.Brush.Color := clBackground; //PaintBox1.GetColorResolvingParent;
       TempBitmap.Canvas.FillRect(0, 0, PaintBox1.Width, PaintBox1.Height);
-      Paint(TempBitmap.Canvas);
+      if Assigned(ControlPlayer) then ControlPlayer.Paint(TempBitmap.Canvas, View)
+        else Core.Game.Map.Paint(TempBitmap.Canvas, View);
       PaintBox1.Canvas.Draw(0, 0, TempBitmap);
     end else begin
@@ -145 +146 @@
       PaintBox1.Canvas.FillRect(0, 0, PaintBox1.Width, PaintBox1.Height);
       {$endif}
-      Paint(PaintBox1.Canvas);
+      if Assigned(ControlPlayer) then ControlPlayer.Paint(PaintBox1.Canvas, View)
+        else Core.Game.Map.Paint(PaintBox1.Canvas, View);
     end;
   end;
@@ -158 +160 @@
 procedure TFormMain.PaintBox1Resize(Sender: TObject);
 begin
-  if Assigned(Core.Player) then
-  with Core.Player do
+  if Assigned(Core.CurrentClient) then
+  with Core.CurrentClient do
     View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
   Redraw;
@@ -251 +253 @@
   NewZoom: Single;
 begin
-  with Core, Game, Player, View do begin
+  with Core, Game, CurrentClient, View do begin
     MapRect := Map.GetPixelRect;
     Factor := FloatPoint((DestRect.Right - DestRect.Left) / (MapRect.Right - MapRect.Left),
@@ -284 +286 @@
 procedure TFormMain.AZoomInExecute(Sender: TObject);
 begin
-  with Core.Player do begin
+  with Core.CurrentClient do begin
     View.Zoom := View.Zoom * ZoomFactor;
   end;
@@ -294 +296 @@
   D: TPoint;
 begin
-  with Core.Player do begin
+  with Core.CurrentClient do begin
     //D := Point(Trunc(MousePos.X - View.Left / ViewZoom),
     //  Trunc(MousePos.Y - View.Top / ViewZoom));
@@ -323 +325 @@
   if (Key = 27) or (Key = 17) then
   if Assigned(Core.Game.CurrentPlayer) then begin
-    Core.Game.CurrentPlayer.View.SelectedCell := nil;
+    Core.CurrentClient.View.SelectedCell := nil;
     Redraw;
   end;
@@ -341 +343 @@
 begin
   if Button = mbLeft then begin
-    if Core.Game.CurrentPlayer.Mode = pmHuman then begin
+    if Assigned(Core.CurrentClient) then begin
       StartMousePoint := Point(X, Y);
-      StartViewPoint := Core.Game.CurrentPlayer.View.SourceRect.TopLeft;
+      StartViewPoint := Core.CurrentClient.View.SourceRect.TopLeft;
       MoveActive := True;
     end;
@@ -361 +363 @@
   CellPos: TPoint;
 begin
-  if Assigned(Core.Game.CurrentPlayer) then begin
+  if Assigned(Core.CurrentClient) then begin
     if MoveActive then
     if (Abs(StartMousePoint.X - X) > Trunc(Screen.PixelsPerInch * MouseMinDiff)) or
     (Abs(StartMousePoint.Y - Y) > Trunc(Screen.PixelsPerInch * MouseMinDiff)) then
-    with Core.Game.CurrentPlayer do begin
-      if Mode = pmHuman then begin
-        View.SourceRect := Bounds(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / View.Zoom),
-          Trunc(StartViewPoint.Y + (StartMousePoint.Y - Y) / View.Zoom),
-          View.SourceRect.Right - View.SourceRect.Left,
-          View.SourceRect.Bottom - View.SourceRect.Top);
-        Redraw;
-      end;
+    with Core.Game.CurrentPlayer, Core.CurrentClient do begin
+      View.SourceRect := Bounds(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / View.Zoom),
+        Trunc(StartViewPoint.Y + (StartMousePoint.Y - Y) / View.Zoom),
+        View.SourceRect.Right - View.SourceRect.Left,
+        View.SourceRect.Bottom - View.SourceRect.Top);
+      Redraw;
     end;
     Cell := nil;
-    OldCell := Core.Game.CurrentPlayer.View.FocusedCell;
+    OldCell := Core.CurrentClient.View.FocusedCell;
     with Core.Game do
-      Cell := Map.PosToCell(CurrentPlayer.View.CanvasToCellPos(Point(X, Y)), CurrentPlayer.View );
+      Cell := Map.PosToCell(Core.CurrentClient.View.CanvasToCellPos(Point(X, Y)), Core.CurrentClient.View );
     if Assigned(Cell) then begin
-      Core.Game.CurrentPlayer.View.FocusedCell := Cell;
+      Core.CurrentClient.View.FocusedCell := Cell;
       StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.PosPx.X) + ', ' + IntToStr(Cell.PosPx.Y) +
         '] (' + IntToStr(Cell.MovesFrom.Count) + ', ' + IntToStr(Cell.MovesTo.Count) + ')';
     end else begin
-      Core.Game.CurrentPlayer.View.FocusedCell := nil;
+      Core.CurrentClient.View.FocusedCell := nil;
       StatusBar1.Panels[0].Text := '';
     end;
-    CellPos := Core.Game.CurrentPlayer.View.CanvasToCellPos(Point(X, Y));
+    CellPos := Core.CurrentClient.View.CanvasToCellPos(Point(X, Y));
     StatusBar1.Panels[2].Text := 'CellPos: ' + IntToStr(CellPos.X) + ', ' + IntToStr(CellPos.Y);
     if Cell <> OldCell then Redraw;
@@ -398 +398 @@
   (Abs(StartMousePoint.Y - Y) < Trunc(Screen.PixelsPerInch * MouseMinDiff)) then begin
     if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) then begin
-      Core.Game.CurrentPlayer.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer, Shift);
+      Core.CurrentClient.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer, Shift);
       Redraw;
     end;

trunk/Forms/UFormNew.pas

@@ -241 +241 @@
   ReloadView;
   //Height := Trunc(1.5 * Height);
+  PageControl1.TabIndex := 0;
 end;