Changeset 199 for trunk/Forms/UFormNew.pas

Timestamp:

May 16, 2018, 2:48:57 PM (6 years ago)

Author:

chronos

Message:

• Modified: Initial game setting made independent to current game settings. So last game can be automatically loaded on start and initial setting will be intact.

File:

• trunk/Forms/UFormNew.pas (modified) (8 diffs)

trunk/Forms/UFormNew.pas

@@ -132 +132 @@
   private
     Players: TPlayers;
+    ServerList: TServerList;
   public
-    ServerList: TServerList;
     procedure Translate;
     procedure ReloadView;
@@ -334 +334 @@
   AServerAdd.Enabled := RadioButtonModeNetworkClient.Checked;
   AServerModify.Enabled := RadioButtonModeNetworkClient.Checked;
+  PageControl2.TabIndex := ComboBoxWinObjective.ItemIndex;
 end;
 
@@ -359 +360 @@
 begin
   Players := TPlayers.Create;
+  ServerList := TServerList.Create;
   FormChat := TFormChat.Create(nil);
   FormChat.ManualDock(PanelChat, nil, alClient);
@@ -383 +385 @@
 procedure TFormNew.ComboBoxWinObjectiveChange(Sender: TObject);
 begin
-  PageControl2.TabIndex := ComboBoxWinObjective.ItemIndex;
+  UpdateInterface;
 end;
 
@@ -483 +485 @@
 procedure TFormNew.FormDestroy(Sender: TObject);
 begin
+  FreeAndNil(ServerList);
   FreeAndNil(Players);
   FreeAndNil(FormChat);
@@ -490 +493 @@
 begin
   with Server do begin
-    CheckBoxSymetricMap.Checked := Game.SymetricMap;
-    CheckBoxVoid.Checked := Game.VoidEnabled;
-    SpinEditVoidPercent.Value := Game.VoidPercentage;
-    SpinEditVoidPercent.Enabled := Game.VoidEnabled;
-    Players.Assign(Game.PlayersSetting);
-    CheckBoxCity.Checked := Game.CityEnabled;
-    SpinEditCityPercent.Value := Game.CityPercentage;
-    SpinEditMapSizeX.Value := Game.Map.Size.X;
-    SpinEditMapSizeY.Value := Game.Map.Size.Y;
-    TrackBarSizeX.Position := Game.Map.Size.X;
-    TrackBarSizeY.Position := Game.Map.Size.Y;
-    RadioGroupGrowAmount.ItemIndex := Integer(Game.GrowAmount);
-    RadioGroupGrowCells.ItemIndex := Integer(Game.GrowCells);
-    ComboBoxGridType.ItemIndex := Integer(Game.MapType) - 1;
-    ComboBoxWinObjective.ItemIndex := Integer(Game.WinObjective);
-    SpinEditNeutralUnits.Value := Game.MaxNeutralUnits;
-    ComboBoxMapShape.ItemIndex := Integer(Game.Map.Shape);
-    EditImageFile.Text := Game.MapImageFileName;
-    CheckBoxFogOfWar.Checked := Game.FogOfWar;
-    CheckBoxBridges.Checked := Game.BridgeEnabled;
     RadioButtonModeLocal.Checked := Mode = smLocal;
     RadioButtonModeNetworkClient.Checked := Mode = smNetworkClient;
@@ -515 +498 @@
     EditServerAddress.Text := LocalNetworkAddress;
     SpinEditServerPort.Value := LocalNetworkPort;
-    SpinEditMaxPower.Value := Game.MaxPower;
-    SpinEditTurns.Value := Game.StayAliveForDefinedTurns;
-    SpinEditSpecialCells.Value := Game.SpecialCaptureCellCount;
+  end;
+  ServerList.Assign(Core.ServerList);
+  Players.Assign(Core.GameSettings.Players);
+  with Core.GameSettings do begin
+    CheckBoxSymetricMap.Checked := SymetricMap;
+    CheckBoxVoid.Checked := VoidEnabled;
+    SpinEditVoidPercent.Value := VoidPercentage;
+    SpinEditVoidPercent.Enabled := VoidEnabled;
+    CheckBoxCity.Checked := CityEnabled;
+    SpinEditCityPercent.Value := CityPercentage;
+    SpinEditMapSizeX.Value := Map.Size.X;
+    SpinEditMapSizeY.Value := Map.Size.Y;
+    TrackBarSizeX.Position := Map.Size.X;
+    TrackBarSizeY.Position := Map.Size.Y;
+    RadioGroupGrowAmount.ItemIndex := Integer(GrowAmount);
+    RadioGroupGrowCells.ItemIndex := Integer(GrowCells);
+    ComboBoxGridType.ItemIndex := Integer(MapType) - 1;
+    ComboBoxWinObjective.ItemIndex := Integer(WinObjective);
+    SpinEditNeutralUnits.Value := MaxNeutralUnits;
+    ComboBoxMapShape.ItemIndex := Integer(Map.Shape);
+    EditImageFile.Text := MapImageFileName;
+    CheckBoxFogOfWar.Checked := FogOfWar;
+    CheckBoxBridges.Checked := BridgeEnabled;
+    SpinEditMaxPower.Value := MaxPower;
+    SpinEditTurns.Value := StayAliveForDefinedTurns;
+    SpinEditSpecialCells.Value := SpecialCaptureCellCount;
   end;
 end;
@@ -536 +542 @@
       RemoteNetworkPort := 0;
     end;
-    Game.PlayersSetting.Assign(Players);
-    Game.SymetricMap := CheckBoxSymetricMap.Checked;
-    Game.VoidEnabled := CheckBoxVoid.Checked;
-    Game.VoidPercentage := SpinEditVoidPercent.Value;
-    Game.CityEnabled := CheckBoxCity.Checked;
-    Game.CityPercentage := SpinEditCityPercent.Value;
-    Game.Map.Size := TPoint.Create(SpinEditMapSizeX.Value, SpinEditMapSizeY.Value);
-    Game.GrowAmount := TGrowAmount(RadioGroupGrowAmount.ItemIndex);
-    Game.GrowCells := TGrowCells(RadioGroupGrowCells.ItemIndex);
-    Game.MapType := TMapType(ComboBoxGridType.ItemIndex + 1);
-    Game.WinObjective := TWinObjective(ComboBoxWinObjective.ItemIndex);
-    Game.MaxNeutralUnits := SpinEditNeutralUnits.Value;
-    Game.Map.Shape := TMapShape(ComboBoxMapShape.ItemIndex);
-    Game.MapImageFileName := EditImageFile.Text;
-    Game.FogOfWar := CheckBoxFogOfWar.Checked;
-    Game.BridgeEnabled := CheckBoxBridges.Checked;
-    Game.MaxPower := SpinEditMaxPower.Value;
-    Game.StayAliveForDefinedTurns := SpinEditTurns.Value;
-    Game.SpecialCaptureCellCount := SpinEditSpecialCells.Value;
+  end;
+  Core.GameSettings.Players.Assign(Players);
+  Core.ServerList.Assign(ServerList);
+  with Core.GameSettings do begin
+    SymetricMap := CheckBoxSymetricMap.Checked;
+    VoidEnabled := CheckBoxVoid.Checked;
+    VoidPercentage := SpinEditVoidPercent.Value;
+    CityEnabled := CheckBoxCity.Checked;
+    CityPercentage := SpinEditCityPercent.Value;
+    Map.Size := TPoint.Create(SpinEditMapSizeX.Value, SpinEditMapSizeY.Value);
+    GrowAmount := TGrowAmount(RadioGroupGrowAmount.ItemIndex);
+    GrowCells := TGrowCells(RadioGroupGrowCells.ItemIndex);
+    MapType := TMapType(ComboBoxGridType.ItemIndex + 1);
+    WinObjective := TWinObjective(ComboBoxWinObjective.ItemIndex);
+    MaxNeutralUnits := SpinEditNeutralUnits.Value;
+    Map.Shape := TMapShape(ComboBoxMapShape.ItemIndex);
+    MapImageFileName := EditImageFile.Text;
+    FogOfWar := CheckBoxFogOfWar.Checked;
+    BridgeEnabled := CheckBoxBridges.Checked;
+    MaxPower := SpinEditMaxPower.Value;
+    StayAliveForDefinedTurns := SpinEditTurns.Value;
+    SpecialCaptureCellCount := SpinEditSpecialCells.Value;
   end;
 end;