Changeset 276 for trunk/Forms/UFormNew.pas

Timestamp:

Feb 3, 2019, 11:55:30 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Load/save game syste name correctly from/to file.

File:

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

trunk/Forms/UFormNew.pas

@@ -33 +33 @@
     ButtonPlayerModify: TButton;
     ButtonPlayerRemove: TButton;
-    CheckBoxUnitsSplitMerge: TCheckBox;
-    CheckBoxEmptyCellsNeutral: TCheckBox;
     CheckBoxBridges: TCheckBox;
     CheckBoxCity: TCheckBox;
@@ -40 +38 @@
     CheckBoxFogOfWar: TCheckBox;
     CheckBoxSymetricMap: TCheckBox;
-    CheckBoxUnitsMoveImmediately: TCheckBox;
     CheckBoxVoid: TCheckBox;
     ComboBoxGameSystem: TComboBox;
@@ -192 +189 @@
 uses
   UFormPlayer, UFormChat, UCore, UFormServer, UClientGUI, UFormClient,
-  UFormGameSystems;
+  UFormGameSystems, UGameSystem;
 
 resourcestring
@@ -367 +364 @@
     SpinEditTurns.Value := StayAliveForDefinedTurns;
     SpinEditSpecialCells.Value := SpecialCaptureCellCount;
-    CheckBoxEmptyCellsNeutral.Checked := GameSystem.EmptyCellsNeutral;
-    CheckBoxUnitsSplitMerge.Checked := GameSystem.UnitsSplitMerge;
-    CheckBoxUnitsMoveImmediately.Checked := GameSystem.UnitsMoveImmediately;
+    ComboBoxGameSystem.ItemIndex := ComboBoxGameSystem.Items.IndexOf(GameSystemName);
   end;
 end;
@@ -398 +393 @@
     StayAliveForDefinedTurns := SpinEditTurns.Value;
     SpecialCaptureCellCount := SpinEditSpecialCells.Value;
-    GameSystem.EmptyCellsNeutral := CheckBoxEmptyCellsNeutral.Checked;
-    GameSystem.UnitsSplitMerge := CheckBoxUnitsSplitMerge.Checked;
-    GameSystem.UnitsMoveImmediately := CheckBoxUnitsMoveImmediately.Checked;
+    GameSystem := TGameSystem(ComboBoxGameSystem.Items.Objects[ComboBoxGameSystem.ItemIndex]);
+    GameSystemName := GameSystem.GetName;
   end;
 end;
@@ -424 +418 @@
       ComboBoxGameSystem.Items.Add('');
     for I := 0 to Core.GameSystems.Count - 1 do begin
-      ComboBoxGameSystem.Items[I] := Core.GameSystems[I].Name;
+      ComboBoxGameSystem.Items[I] := Core.GameSystems[I].GetName;
       ComboBoxGameSystem.Items.Objects[I] := Core.GameSystems[I];
     end;
@@ -558 +552 @@
   Core.PersistentForm.Load(Self);
   Core.ThemeManager1.UseTheme(Self);
-  ReloadGameSystemsMenu;
   ReloadView;
   //Height := Trunc(1.5 * Height);
@@ -773 +766 @@
 procedure TFormNew.Load(Server: TServer);
 begin
+  ReloadGameSystemsMenu;
   with Server do begin
     RadioButtonModeLocal.Checked := Mode = smLocal;