Changeset 19 for trunk

Timestamp:

Feb 27, 2014, 7:43:00 AM (11 years ago)

Author:

chronos

Message:

• Modified: Center map to screen after new game is started.

Location:

trunk

Files:

• UFormMain.pas (modified) (1 diff)
• UFormNew.pas (modified) (1 diff)
• UGame.pas (modified) (3 diffs)

trunk/UFormMain.pas

@@ -210 +210 @@
 procedure TFormMain.PaintBox1MouseWheelDown(Sender: TObject;
   Shift: TShiftState; MousePos: TPoint; var Handled: Boolean);
-begin
-  with Game.CurrentPlayer do
+var
+  D: TPoint;
+begin
+  with Game.CurrentPlayer do begin
+    D := Point(Trunc(MousePos.X - Game.CurrentPlayer.View.Left / ViewZoom),
+      Trunc(MousePos.Y - Game.CurrentPlayer.View.Top / ViewZoom));
     ViewZoom := ViewZoom / ZoomFactor;
+    //View := Bounds(Trunc((D.X - MousePos.X) * ViewZoom),
+    //  Trunc((D.Y - MousePos.Y) * ViewZoom),
+    //  View.Right - View.Left,
+    //  View.Bottom - View.Top);
+  end;
   Redraw;
 end;

trunk/UFormNew.pas

@@ -114 +114 @@
   CheckBoxVoid.Checked := Game.VoidEnabled;
   for I := 0 to Players.Count - 1 do
-    TPlayer(Players[I]).Free;
+    Players[I] := nil;
   Players.Count := Game.Players.Count;
   for I := 0 to Game.Players.Count - 1 do begin

trunk/UGame.pas

@@ -66 +66 @@
     procedure ClearCellMoves;
     procedure ComputePlayerStats;
+    function GetPixelSize: TPoint;
     property Size: TPoint read FSize write SetSize;
   end;
@@ -445 +446 @@
       StartCell.Power := TPlayer(Players[I]).StartUnits;
     end;
+    ViewZoom := 1;
+    // Center board
+    View := Bounds(-(View.Right - View.Left) div 2 + Map.GetPixelSize.X div 2,
+      -(View.Bottom - View.Top) div 2 + Map.GetPixelSize.Y div 2,
+      View.Right - View.Left,
+      View.Bottom - View.Top);
   end;
   CurrentPlayer := TPlayer(Players[0]);
@@ -667 +674 @@
 end;
 
+function THexMap.GetPixelSize: TPoint;
+begin
+  Result := Point(Size.X * DefaultCellSize.X, Size.Y * DefaultCellSize.Y);
+end;
+
 end.