Changeset 23 for trunk/UFormMain.pas

Timestamp:

Mar 2, 2014, 11:27:14 PM (11 years ago)

Author:

chronos

Message:

• Modified: Calculation of player visible frame is now handled by TView class.
• Fixed: Set proper max power on existing player move update.

File:

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

trunk/UFormMain.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, types;
+  UGame, LCLType, Menus, ActnList, ComCtrls, types;
 
 const
@@ -26 +26 @@
     MenuItem7: TMenuItem;
     PaintBox1: TPaintBox;
+    StatusBar1: TStatusBar;
     Timer1: TTimer;
     procedure FormActivate(Sender: TObject);
@@ -63 +64 @@
   UFormNew, UFormMove, UCore;
 
+resourcestring
+  STurn = 'turn';
+
 {$R *.lfm}
 
@@ -71 +75 @@
   if Core.Game.Running then
   with Core.Game.CurrentPlayer do begin
-    ViewSize := Point(PaintBox1.Width, PaintBox1.Height);
+    View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
     Paint(PaintBox1);
   end;
@@ -84 +88 @@
   if Assigned(Core.Game.CurrentPlayer) then
   with Core.Game.CurrentPlayer do
-    ViewSize := Point(PaintBox1.Width, PaintBox1.Height);
+    View.DestRect := Bounds(0, 0, PaintBox1.Width, PaintBox1.Height);
   Redraw;
 end;
@@ -98 +102 @@
     NewCaption := 'xTactics';
     if Assigned(Core.Game.CurrentPlayer) then
-      NewCaption := Core.Game.CurrentPlayer.Name + ' - turn ' + IntToStr(Core.Game.TurnCounter) + ' - ' + NewCaption;
+      NewCaption := Core.Game.CurrentPlayer.Name + ' - ' + STurn + ' ' + IntToStr(Core.Game.TurnCounter) + ' - ' + NewCaption;
     Caption := NewCaption;
   end;
@@ -134 +138 @@
     if Core.Game.CurrentPlayer.Mode = pmHuman then begin
       StartMousePoint := Point(X, Y);
-      StartViewPoint := Core.Game.CurrentPlayer.CellPos;
+      StartViewPoint := Core.Game.CurrentPlayer.View.SourceRect.TopLeft;
       MoveActive := True;
     end;
@@ -147 +151 @@
 procedure TFormMain.PaintBox1MouseMove(Sender: TObject; Shift: TShiftState; X,
   Y: Integer);
-begin
-  if MoveActive then begin
-    if Core.Game.CurrentPlayer.Mode = pmHuman then begin
-      Core.Game.CurrentPlayer.CellPos := Point(Trunc(StartViewPoint.X + (StartMousePoint.X - X) / Core.Game.CurrentPlayer.ViewZoom),
-        Trunc(StartViewPoint.Y + (StartMousePoint.Y - Y) / Core.Game.CurrentPlayer.ViewZoom));
-      Redraw;
-    end;
-  end;
+var
+  Cell: TCell;
+  OldCell: TCell;
+begin
+  if Assigned(Core.Game.CurrentPlayer) then begin
+    if MoveActive 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;
+    end;
+    Cell := nil;
+    OldCell := Core.Game.CurrentPlayer.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;
+      StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.Pos.X) + ', ' + IntToStr(Cell.Pos.Y) + ']';
+    end else begin
+      Core.Game.CurrentPlayer.FocusedCell := nil;
+      StatusBar1.Panels[0].Text := '';
+    end;
+    if Cell <> OldCell then Redraw;
+  end else StatusBar1.Panels[0].Text := '';
 end;
 
@@ -177 +201 @@
     //D := Point(Trunc(MousePos.X - View.Left / ViewZoom),
     //  Trunc(MousePos.Y - View.Top / ViewZoom));
-    ViewZoom := ViewZoom / ZoomFactor;
+    View.Zoom := View.Zoom / ZoomFactor;
     //View := Bounds(Trunc((D.X - MousePos.X) * ViewZoom),
     //  Trunc((D.Y - MousePos.Y) * ViewZoom),
@@ -190 +214 @@
 begin
   with Core.Game.CurrentPlayer do
-    ViewZoom := ViewZoom * ZoomFactor;
+    View.Zoom := View.Zoom * ZoomFactor;
   Redraw;
 end;