Changeset 191

Timestamp:

May 1, 2018, 10:16:08 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Clients initialization if game is loaded from file.
• Fixed: Removed compilation warnings.

Location:

trunk

Files:

• UCore.pas (modified) (3 diffs)
• UGame.pas (modified) (2 diffs)
• UGameServer.pas (modified) (1 diff)

trunk/UCore.pas

@@ -155 +155 @@
 procedure TCore.LoadConfig;
 begin
-  RegistryContext := RegContext(HKEY_CURRENT_USER, DefaultRegKey);
+  RegistryContext := TRegistryContext.Create(HKEY_CURRENT_USER, DefaultRegKey);
   PersistentForm.RegistryContext := RegistryContext;
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
@@ -415 +415 @@
 
 procedure TCore.LoadGame(FileName: string);
+var
+  Player: TPlayer;
+  NewClient: TClient;
 begin
   Game.LoadFromFile(FileName);
-  Server.InitClients;
-  SelectClient;
-  LastOpenedList1.AddItem(FileName);
-  with FormClient.Client do
-    View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0),
-      TPoint.Create(FormClient.PaintBox1.Width, FormClient.PaintBox1.Height));
-  FormClient.AZoomAll.Execute;
-  RedrawClients;
-  UpdateOtherForms;
-end;
-
-procedure TCore.RedrawClients;
-var
-  Form: TFormClient;
-begin
-  for Form in FormClients do
-    Form.Redraw;
-  FormClient.Redraw;
-end;
-
-procedure TCore.UpdateOtherForms;
-begin
-  if Assigned(FormCharts) and FormCharts.Visible then FormCharts.Redraw;
-  if Assigned(FormUnitMoves) and FormUnitMoves.Visible then FormUnitMoves.ReloadList;
-  if Assigned(FormPlayersStats) and FormPlayersStats.Visible then FormPlayersStats.ReloadList;
-end;
-
-procedure TCore.Spectate(Player: TPlayer);
-var
-  Form: TFormClient;
-begin
-  Form := TFormClient.Create(nil);
-  Form.Client := Clients.New(SSpectator);
-  //Form.Client.Form := Form;
-  //Form.Client.ControlPlayer := Player;
-  Form.AZoomAll.Execute;
-  Form.Show;
-  FormClients.Add(Form);
-end;
-
-procedure TCore.StartNewGame;
-var
-  NewClient: TClient;
-  Player: TPlayer;
-begin
-  Game.New;
   Server.InitClients;
 
@@ -478 +435 @@
   end;
 
+  SelectClient;
+  LastOpenedList1.AddItem(FileName);
+  with FormClient.Client do
+    View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0),
+      TPoint.Create(FormClient.PaintBox1.Width, FormClient.PaintBox1.Height));
+  FormClient.AZoomAll.Execute;
+  RedrawClients;
+  UpdateOtherForms;
+end;
+
+procedure TCore.RedrawClients;
+var
+  Form: TFormClient;
+begin
+  for Form in FormClients do
+    Form.Redraw;
+  FormClient.Redraw;
+end;
+
+procedure TCore.UpdateOtherForms;
+begin
+  if Assigned(FormCharts) and FormCharts.Visible then FormCharts.Redraw;
+  if Assigned(FormUnitMoves) and FormUnitMoves.Visible then FormUnitMoves.ReloadList;
+  if Assigned(FormPlayersStats) and FormPlayersStats.Visible then FormPlayersStats.ReloadList;
+end;
+
+procedure TCore.Spectate(Player: TPlayer);
+var
+  Form: TFormClient;
+begin
+  Form := TFormClient.Create(nil);
+  Form.Client := Clients.New(SSpectator);
+  //Form.Client.Form := Form;
+  //Form.Client.ControlPlayer := Player;
+  Form.AZoomAll.Execute;
+  Form.Show;
+  FormClients.Add(Form);
+end;
+
+procedure TCore.StartNewGame;
+var
+  NewClient: TClient;
+  Player: TPlayer;
+begin
+  Game.New;
+  Server.InitClients;
+
+  // Create local clients for human players
+  for Player in Game.Players do
+  with Player do
+  if Mode = pmHuman then begin
+    NewClient := Clients.New(Name);
+    NewClient.ControlPlayer := Player;
+    NewClient.View.Clear;
+    NewClient.View.Zoom := 1;
+    if Assigned(NewClient.ControlPlayer.StartCell) then
+      NewClient.View.CenterPlayerCity(NewClient.ControlPlayer)
+      else NewClient.View.CenterMap;
+  end;
+
   Game.DevelMode := DevelMode;
   SelectClient;

trunk/UGame.pas

@@ -8 +8 @@
   Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite, Forms,
   DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf, fgl,
-  UGeometry, SpecializedList;
+  UGeometry;
 
 const
@@ -1467 +1467 @@
       if Power < MaxPower then begin
         // Increase units count
-        if Game.GrowAmount = gaByOne then Addition := 1
-          else if Game.GrowAmount = gaBySquareRoot then begin
-            Addition := Trunc(Sqrt(Power));
-            if Addition = 0 then Addition := 1;
-          end;
+        Addition := 0;
+        if Game.GrowAmount = gaByOne then begin
+          Addition := 1;
+        end else
+        if Game.GrowAmount = gaBySquareRoot then begin
+          Addition := Trunc(Sqrt(Power));
+          if Addition = 0 then Addition := 1;
+        end;
         Power := Min(Power + Addition, MaxPower);
       end else

trunk/UGameServer.pas

@@ -192 +192 @@
 
 procedure TServer.InitClients;
-var
-  Client: TServerClient;
-  Player: TPlayer;
 begin
   Clients.Clear;