Changeset 287 for trunk/UCore.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/UCore.pas (modified) (2 diffs)

trunk/UCore.pas

@@ -353 +353 @@
 
 procedure TCore.AGameNewExecute(Sender: TObject);
+var
+  NewServer: TServer;
 begin
   FormNew := TFormNew.Create(nil);
   try
-    FormNew.Load(Server);
+    NewServer := TServer.Create;
+    NewServer.Assign(Server);
+    NewServer.Game := TGame.Create;
+    NewServer.Game.Assign(GameSettings);
+    FormNew.Server := NewServer;
     FormNew.PageControl1.TabIndex := FormNewTabIndex;
     if FormNew.ShowModal = mrOk then begin
+      Server.Assign(NewServer);
+      Server.Game := Game;
       Game.Running := False;
-      FormNew.Save(Server);
-      GameSettings.PostConfig;
-      Game.Assign(GameSettings);
+      Game.PostConfig;
+      Game.Assign(NewServer.Game);
+      GameSettings.Assign(NewServer.Game);
       SaveConfigAll;
       StartNewGame;
@@ -368 +376 @@
     end;
     FormNewTabIndex := FormNew.PageControl1.TabIndex;
+    NewServer.Game.Free;
+    NewServer.Game := nil;
+    NewServer.Free;
   finally
     FormNew.Free;