Changeset 30 for trunk/UFormMain.pas

Timestamp:

Mar 4, 2014, 12:18:22 AM (10 years ago)

Author:

chronos

Message:

• Modified: Player FocusedCell and SelectedCell moved to TView instance from TPlayer.

File:

• trunk/UFormMain.pas (modified) (4 diffs)

trunk/UFormMain.pas

@@ -34 +34 @@
     ToolButton4: TToolButton;
     procedure FormActivate(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -132 +133 @@
 end;
 
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  Core.Game.Running := False;
+end;
+
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
@@ -176 +182 @@
     end;
     Cell := nil;
-    OldCell := Core.Game.CurrentPlayer.FocusedCell;
+    OldCell := Core.Game.CurrentPlayer.View.FocusedCell;
     with Core.Game do
       Cell := Map.PosToCell(CurrentPlayer.View.CanvasToCellPos(Point(X, Y)), CurrentPlayer.View );
     if Assigned(Cell) then begin
-      Core.Game.CurrentPlayer.FocusedCell := Cell;
+      Core.Game.CurrentPlayer.View.FocusedCell := Cell;
       StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.Pos.X) + ', ' + IntToStr(Cell.Pos.Y) + ']';
     end else begin
-      Core.Game.CurrentPlayer.FocusedCell := nil;
+      Core.Game.CurrentPlayer.View.FocusedCell := nil;
       StatusBar1.Panels[0].Text := '';
     end;
@@ -195 +201 @@
   if (Abs(StartMousePoint.X - X) < 5) and (Abs(StartMousePoint.Y - Y) < 5) then begin
     if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) then begin
-      Core.Game.CurrentPlayer.SelectCell(Point(X, Y));
+      Core.Game.CurrentPlayer.View.SelectCell(Point(X, Y), Core.Game.CurrentPlayer);
       Redraw;
     end;