Changeset 304 for trunk/Forms/UFormNew.pas

Timestamp:

Aug 11, 2019, 4:53:05 PM (5 years ago)

Author:

chronos

Message:

• Fixed: First game system was rewritten by game system stored in game file.
• Modified: Each TGame instance has own TGameSystem instance and different game systems are assigned.

File:

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

trunk/Forms/UFormNew.pas

@@ -304 +304 @@
     SpinEditTurns.Value := StayAliveForDefinedTurns;
     SpinEditSpecialCells.Value := SpecialCaptureCellCount;
-    GameSystem := Game.GameSystem;
-    ComboBoxGameSystem.ItemIndex := ComboBoxGameSystem.Items.IndexOf(GameSystemName);
+    ComboBoxGameSystem.ItemIndex := ComboBoxGameSystem.Items.IndexOf(GameSystem.GetName);
     if (ComboBoxGameSystem.ItemIndex = -1) and (ComboBoxGameSystem.Items.Count > 0) then
       ComboBoxGameSystem.ItemIndex := 0;
@@ -335 +334 @@
     StayAliveForDefinedTurns := SpinEditTurns.Value;
     SpecialCaptureCellCount := SpinEditSpecialCells.Value;
-    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;
@@ -397 +389 @@
 begin
   Image1.Height := Round(Image1.Width * SpinEditMapSizeY.Value / SpinEditMapSizeX.Value);
-  GamePreview.GameSystem := Core.GameSystems.First;
+  GamePreview.GameSystem.Assign(FServer.Game.GameSystem);
   SaveGame(GamePreview);
   GamePreview.PostConfig;
@@ -567 +559 @@
 procedure TFormNew.ComboBoxGameSystemChange(Sender: TObject);
 begin
-  FServer.Game.GameSystem := TGameSystem(ComboBoxGameSystem.Items.Objects[ComboBoxGameSystem.ItemIndex]);
+  FServer.Game.GameSystem.Assign(TGameSystem(ComboBoxGameSystem.Items.Objects[ComboBoxGameSystem.ItemIndex]));
   UpdateInterface;
   MapPreviewRedraw;