Changeset 287 for trunk/Forms/UFormNew.pas

Timestamp:

Mar 24, 2019, 2:26:29 PM (6 years ago)

Author:

chronos

Message:

• Fixed: FormNew default undefined game system causing error.
• Modified: FormNew and FormUnitKind use Server property insteady Load/Save methods.

File:

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

trunk/Forms/UFormNew.pas

@@ -105 +105 @@
     procedure ButtonGameSystemsClick(Sender: TObject);
     procedure ButtonImageBrowseClick(Sender: TObject);
+    procedure ButtonOkClick(Sender: TObject);
     procedure ButtonRandomizeClick(Sender: TObject);
     procedure CheckBoxBridgesChange(Sender: TObject);
@@ -138 +139 @@
     procedure TrackBarSizeXChange(Sender: TObject);
   private
-    Players: TPlayers;
+    FServer: TServer;
     ServerList: TServerList;
     GamePreview: TGame;
@@ -144 +145 @@
     NewRandSeed: Cardinal;
     FormPlayers: TFormPlayers;
-    GameSystem: TGameSystem;
     procedure LoadGame(Game: TGame);
     procedure SaveGame(Game: TGame);
+    procedure Load(Server: TServer);
+    procedure Save(Server: TServer);
     procedure MapPreviewPaint;
     procedure MapPreviewRedraw;
     procedure ReloadGameSystemsMenu;
+    procedure SetServer(AValue: TServer);
   public
     procedure Translate;
     procedure ReloadView;
     procedure UpdateInterface;
-    procedure Load(Server: TServer);
-    procedure Save(Server: TServer);
+    property Server: TServer read FServer write SetServer;
   end;
 
@@ -278 +280 @@
 procedure TFormNew.LoadGame(Game: TGame);
 begin
-  FormPlayers.Players.Assign(Game.Players);
   with Game do begin
     CheckBoxSymetricMap.Checked := SymetricMap;
@@ -303 +304 @@
     SpinEditTurns.Value := StayAliveForDefinedTurns;
     SpinEditSpecialCells.Value := SpecialCaptureCellCount;
+    GameSystem := Game.GameSystem;
     ComboBoxGameSystem.ItemIndex := ComboBoxGameSystem.Items.IndexOf(GameSystemName);
+    if (ComboBoxGameSystem.ItemIndex = -1) and (ComboBoxGameSystem.Items.Count > 0) then
+      ComboBoxGameSystem.ItemIndex := 0;
   end;
 end;
@@ -309 +313 @@
 procedure TFormNew.SaveGame(Game: TGame);
 begin
-  Game.Players.Assign(FormPlayers.Players);
   with Game do begin
     StoredRandSeed := NewRandSeed;
@@ -332 +335 @@
     StayAliveForDefinedTurns := SpinEditTurns.Value;
     SpecialCaptureCellCount := SpinEditSpecialCells.Value;
-    GameSystem := TGameSystem(ComboBoxGameSystem.Items.Objects[ComboBoxGameSystem.ItemIndex]);
-    GameSystemName := GameSystem.GetName;
+    if ComboBoxGameSystem.ItemIndex <> -1 then begin
+      GameSystem := TGameSystem(ComboBoxGameSystem.Items.Objects[ComboBoxGameSystem.ItemIndex]);
+      GameSystemName := GameSystem.GetName;
+    end else begin
+      GameSystem := nil;
+      GameSystemName := '';
+    end;
   end;
 end;
@@ -366 +374 @@
   finally
     ComboBoxGameSystem.Items.EndUpdate;
+  end;
+  if (ComboBoxGameSystem.ItemIndex = -1) and (ComboBoxGameSystem.Items.Count > 0) then
+    ComboBoxGameSystem.ItemIndex := 0;
+end;
+
+procedure TFormNew.SetServer(AValue: TServer);
+begin
+  if FServer = AValue then Exit;
+  FServer := AValue;
+  if Assigned(FServer) then begin
+    Load(FServer);
+    FormPlayers.Players := FServer.Game.Players;
+  end else begin
+    FormPlayers.Players := nil;
   end;
 end;
@@ -452 +474 @@
   ListViewServers.Items.Count := ServerList.Items.Count;
   ListViewServers.Refresh;
-  Translate;
   UpdateInterface;
 end;
@@ -460 +481 @@
   WinObjective: TWinObjective;
 begin
-  GameSystem := TGameSystem(ComboBoxGameSystem.Items.Objects[ComboBoxGameSystem.ItemIndex]);
-  ComboBoxGridType.Enabled := GameSystem.PreferedMapType = mtNone;
-  if GameSystem.PreferedMapType <> mtNone then
-    ComboBoxGridType.ItemIndex := ComboBoxGridType.Items.IndexOfObject(TObject(GameSystem.PreferedMapType));
+
+  ComboBoxGridType.Enabled := FServer.Game.GameSystem.PreferedMapType = mtNone;
+  if FServer.Game.GameSystem.PreferedMapType <> mtNone then
+    ComboBoxGridType.ItemIndex := ComboBoxGridType.Items.IndexOfObject(TObject(FServer.Game.GameSystem.PreferedMapType));
   EditImageFile.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
   ButtonImageBrowse.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
@@ -513 +534 @@
   FormChat.Align := alClient;
   FormChat.Show;
-  Players := TPlayers.Create;
-  Players.Game := GamePreview;
   FormPlayers := TFormPlayers.Create(nil);
   FormPlayers.MinItemCount := MinPlayerCount;
   FormPlayers.MaxItemCount := MaxPlayerCount;
-  FormPlayers.Players := Players;
   FormPlayers.ManualDock(Panel2, nil, alClient);
   FormPlayers.Align := alClient;
@@ -549 +567 @@
 procedure TFormNew.ComboBoxGameSystemChange(Sender: TObject);
 begin
+  FServer.Game.GameSystem := TGameSystem(ComboBoxGameSystem.Items.Objects[ComboBoxGameSystem.ItemIndex]);
   UpdateInterface;
   MapPreviewRedraw;
@@ -641 +660 @@
 end;
 
+procedure TFormNew.ButtonOkClick(Sender: TObject);
+begin
+  Save(FServer);
+end;
+
 procedure TFormNew.ButtonRandomizeClick(Sender: TObject);
 begin
@@ -657 +681 @@
   FreeAndNil(ServerList);
   FreeAndNil(FormChat);
-  FreeAndNil(Players);
   FreeAndNil(FormPlayers);
   FreeAndNil(GamePreview);
@@ -673 +696 @@
   end;
   ServerList.Assign(Core.ServerList);
-  LoadGame(Core.GameSettings);
+  LoadGame(Server.Game);
 end;
 
@@ -693 +716 @@
   end;
   Core.ServerList.Assign(ServerList);
-  SaveGame(Core.GameSettings);
+  SaveGame(Server.Game);
 end;