Changeset 126 for trunk

Timestamp:

Jun 17, 2017, 2:54:50 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Center map to player main city at start.

Location:

trunk

Files:

• UCore.pas (modified) (7 diffs)
• UGame.pas (modified) (3 diffs)

trunk/UCore.pas

@@ -52 +52 @@
     StoredDimension: TControlDimension;
     RegistryContext: TRegistryContext;
+    procedure StartNewGame;
     procedure DoPlayerChange(Sender: TObject);
     procedure DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
@@ -285 +286 @@
     if Game.CurrentPlayer.Mode = pmComputer then begin
       Computer := TComputer.Create;
-      Computer.Game := Game;
-      Computer.Process;
-      Computer.Free;
+      try
+        Computer.Game := Game;
+        Computer.Process;
+      finally
+        Computer.Free;
+      end;
       FormMain.Redraw;
       Delay(Trunc((100 - AnimationSpeed) / 100 * 2000));
@@ -320 +324 @@
   if FormNew.ShowModal = mrOk then begin
     FormNew.Save(Game);
-    Game.New;
-    SelectClient;
-    Game.Running := True;
-    FormMain.AZoomAll.Execute;
-    UpdateActions;
+    StartNewGame;
   end;
 end;
@@ -331 +331 @@
 begin
   if MessageDlg(SRestartGame, SRestartGameQuestion, mtConfirmation, mbYesNo, 0) = mrYes then begin
-    Game.New;
-    Game.Running := True;
-    FormMain.AZoomAll.Execute;
-    FormMain.Redraw;
-    UpdateActions;
+    StartNewGame;
   end;
 end;
@@ -396 +392 @@
 end;
 
+procedure TCore.StartNewGame;
+begin
+  Game.New;
+  SelectClient;
+  Game.Running := True;
+  FormMain.Redraw;
+  UpdateActions;
+end;
+
 procedure TCore.DoPlayerChange(Sender: TObject);
 begin
@@ -413 +418 @@
   FInitialized := True;
   LoadConfig;
-  for I := 0 to Game.Clients.Count - 1 do
-    TClient(Game.Clients[I]).View.DestRect := Rect(0, 0, FormMain.PaintBox1.Width,
-      FormMain.PaintBox1.Height);
   Game.LoadConfig(XMLConfig1, 'Game');
 
@@ -421 +423 @@
   ScaleDPI;
 
-  if Game.FileName = '' then begin
-    Game.New;
-    SelectClient;
-    Game.Running := True;
-    FormMain.AZoomAll.Execute;
-  end;
+  if Game.FileName = '' then StartNewGame;
 end;
 

trunk/UGame.pas

@@ -128 +128 @@
     procedure SelectCell(Pos: TPoint; Player: TPlayer; ShiftState: TShiftState);
     procedure CenterMap;
+    procedure CenterPlayerCity(Player: TPlayer);
     function CanvasToCellPos(Pos: TPoint): TPoint;
     function CellToCanvasPos(Pos: TPoint): TPoint;
@@ -2226 +2227 @@
 end;
 
+procedure TView.CenterPlayerCity(Player: TPlayer);
+begin
+  SourceRect := Bounds(Player.StartCell.PosPx.X - (SourceRect.Right - SourceRect.Left) div 2,
+    Player.StartCell.PosPx.Y - (SourceRect.Bottom - SourceRect.Top) div 2,
+    SourceRect.Right - SourceRect.Left,
+    SourceRect.Bottom - SourceRect.Top);
+end;
+
 procedure TPlayer.Paint(Canvas: TCanvas; View: TView);
 begin
@@ -3048 +3057 @@
     View.Clear;
     View.Zoom := 1;
-    View.CenterMap;
+    if Assigned(ControlPlayer) then View.CenterPlayerCity(ControlPlayer)
+      else View.CenterMap;
   end;
 end;