Changeset 223 for trunk/Forms

Timestamp:

Jul 14, 2018, 7:21:43 PM (6 years ago)

Author:

chronos

Message:

• Modified: CellMoves moved from terrain map to player map. Every player should have own moves to avoid affecting moves of different player.

Location:

trunk/Forms

Files:

• UFormClient.lfm (modified) (4 diffs)
• UFormClient.pas (modified) (6 diffs)

trunk/Forms/UFormClient.lfm

@@ -7 +7 @@
   ClientHeight = 621
   ClientWidth = 775
-  DesignTimePPI = 120
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -13 +13 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '1.8.2.0'
+  LCLVersion = '1.8.4.0'
   WindowState = wsMaximized
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 28
-    Top = 593
+    Height = 30
+    Top = 591
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 593
+    Height = 591
     Top = 0
     Width = 32
@@ -80 +80 @@
   object PaintBox1: TPaintBox
     Left = 32
-    Height = 593
+    Height = 591
     Top = 0
     Width = 743

trunk/Forms/UFormClient.pas

@@ -85 +85 @@
     procedure DoNextPlayer(Sender: TObject);
     procedure DoTurnStart(Sender: TObject);
-    procedure DoMove(CellFrom, CellTo: TCell; var CountOnce,
+    procedure DoMove(CellFrom, CellTo: TPlayerCell; var CountOnce,
       CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
     procedure SetToolbarHints;
@@ -129 +129 @@
 end;
 
-procedure TFormClient.DoMove(CellFrom, CellTo: TCell; var CountOnce,
+procedure TFormClient.DoMove(CellFrom, CellTo: TPlayerCell; var CountOnce,
   CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
 var
@@ -146 +146 @@
     FormMove.TrackBarRepeat.Max := FormMove.SpinEditRepeat.MaxValue;
     FormMove.TrackBarRepeat.Position := FormMove.SpinEditRepeat.Value;
-    FormMove.DefendCount := CellTo.Power;
+    FormMove.DefendCount := CellTo.MapCell.Power;
     // Attack count from other surrounding cells without current move if already exists
     FormMove.AttackCount := 0;
@@ -152 +152 @@
     if TUnitMove(CellTo.MovesTo[I]).CellFrom <> CellFrom then
       FormMove.AttackCount := FormMove.AttackCount + TUnitMove(CellTo.MovesTo[I]).CountOnce;
-    FormMove.ShowWinProbability := CellTo.Player <> CellFrom.Player;
+    FormMove.ShowWinProbability := CellTo.MapCell.Player <> CellFrom.MapCell.Player;
 
     if FormMove.ShowModal = mrOk then begin
@@ -456 +456 @@
   Y: Integer);
 var
-  Cell: TCell;
-  OldCell: TCell;
+  Cell: TPlayerCell;
+  OldCell: TPlayerCell;
   CellPos: TPoint;
 begin
@@ -473 +473 @@
     OldCell := Client.View.FocusedCell;
     with Core.Game do
-      Cell := Map.PosToCell(Client.View.CanvasToCellPos(TPoint.Create(X, Y)), Client.View);
+      if Assigned(Client.ControlPlayer) then
+        Cell := Client.ControlPlayer.PlayerMap.PosToCell(Client.View.CanvasToCellPos(TPoint.Create(X, Y)), Client.View);
+        //else Cell := Client.Game.Map.PosToCell(Client.View.CanvasToCellPos(TPoint.Create(X, Y)), Client.View);
     if Assigned(Cell) then begin
       Client.View.FocusedCell := Cell;
-      StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.PosPx.X) + ', ' + IntToStr(Cell.PosPx.Y) +
-        '] (' + IntToStr(Cell.MovesFrom.Count) + ', ' + IntToStr(Cell.MovesTo.Count) + ') ' + IntToStr(Cell.Id);
+      StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.MapCell.PosPx.X) + ', ' + IntToStr(Cell.MapCell.PosPx.Y) +
+        '] (' + IntToStr(Cell.MovesFrom.Count) + ', ' + IntToStr(Cell.MovesTo.Count) + ') ' + IntToStr(Cell.MapCell.Id);
     end else begin
       Client.View.FocusedCell := nil;