Changeset 281 for trunk/Forms

Timestamp:

Feb 21, 2019, 10:45:41 PM (6 years ago)

Author:

chronos

Message:

• Added: New map type hexagonal horizontal.
• Added: Limit allowed map type according selected game system.

Location:

trunk/Forms

Files:

• UFormNew.lfm (modified) (7 diffs)
• UFormNew.pas (modified) (9 diffs)

trunk/Forms/UFormNew.lfm

@@ -21 +21 @@
     Top = 60
     Width = 806
-    ActivePage = TabSheetPlayers
+    ActivePage = TabSheetMap
     Align = alClient
     BorderSpacing.Around = 4
-    TabIndex = 1
+    TabIndex = 2
     TabOrder = 0
     OnChange = PageControl1Change
@@ -178 +178 @@
       object Panel1: TPanel
         Left = 0
-        Height = 652
+        Height = 596
         Top = 0
         Width = 796
         Align = alClient
         BevelOuter = bvNone
-        ClientHeight = 652
+        ClientHeight = 596
         ClientWidth = 796
         TabOrder = 0
@@ -260 +260 @@
           Height = 38
           Top = 104
-          Width = 208
+          Width = 304
           ItemHeight = 0
           Items.Strings = (
@@ -277 +277 @@
           Height = 38
           Top = 144
-          Width = 208
+          Width = 304
           ItemHeight = 0
           Items.Strings = (
@@ -579 +579 @@
           object TabSheetCaptureCells: TTabSheet
             ClientHeight = 74
-            ClientWidth = 763
+            ClientWidth = 769
             object Label14: TLabel
               Left = 8
@@ -601 +601 @@
           object TabSheetStayAliveTurns: TTabSheet
             ClientHeight = 74
-            ClientWidth = 763
+            ClientWidth = 769
             object Label13: TLabel
               Left = 8
@@ -701 +701 @@
       Width = 254
       ItemHeight = 0
+      OnChange = ComboBoxGameSystemChange
       Style = csDropDownList
       TabOrder = 0

trunk/Forms/UFormNew.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
   ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame, UGeometry, UPlayer,
-  UGameServer, UServerList, UMap, UFormPlayers;
+  UGameServer, UServerList, UMap, UFormPlayers, UGameSystem;
 
 type
@@ -111 +111 @@
     procedure CheckBoxSymetricMapChange(Sender: TObject);
     procedure CheckBoxVoidChange(Sender: TObject);
+    procedure ComboBoxGameSystemChange(Sender: TObject);
     procedure ComboBoxGridTypeChange(Sender: TObject);
     procedure ComboBoxMapShapeChange(Sender: TObject);
@@ -143 +144 @@
     NewRandSeed: Cardinal;
     FormPlayers: TFormPlayers;
+    GameSystem: TGameSystem;
     procedure LoadGame(Game: TGame);
     procedure SaveGame(Game: TGame);
@@ -165 +167 @@
 
 uses
-  UFormPlayer, UFormChat, UCore, UFormServer, UClientGUI, UFormClient,
-  UFormGameSystems, UGameSystem;
+  UFormChat, UCore, UFormServer, UClientGUI, UFormClient,
+  UFormGameSystems, UMapType;
 
 resourcestring
-  SGridTypeHexagon = 'Hexagonal';
-  SGridTypeSquare = 'Square';
-  SGridTypeTriangle = 'Triangural';
-  SGridTypeRandom = 'Random';
-  SGridTypeIsometric = 'Isometric';
   SWinObjectiveNone = 'None';
   SWinObjectiveDefeatAllOponents = 'Defeat all oponents';
@@ -296 +293 @@
     RadioGroupGrowAmount.ItemIndex := Integer(GrowAmount);
     RadioGroupGrowCells.ItemIndex := Integer(GrowCells);
-    ComboBoxGridType.ItemIndex := Integer(MapType) - 1;
+    ComboBoxGridType.ItemIndex := ComboBoxGridType.Items.IndexOfObject(TObject(MapType));
     ComboBoxWinObjective.ItemIndex := Integer(WinObjective);
     SpinEditNeutralUnits.Value := MaxNeutralUnits;
@@ -325 +322 @@
     GrowAmount := TGrowAmount(RadioGroupGrowAmount.ItemIndex);
     GrowCells := TGrowCells(RadioGroupGrowCells.ItemIndex);
-    MapType := TMapType(ComboBoxGridType.ItemIndex + 1);
+    MapType := TMapType(ComboBoxGridType.Items.Objects[ComboBoxGridType.ItemIndex]);
     WinObjective := TWinObjective(ComboBoxWinObjective.ItemIndex);
     MaxNeutralUnits := SpinEditNeutralUnits.Value;
@@ -406 +403 @@
     LastIndex := ItemIndex;
     Clear;
-    Items.Add(SGridTypeHexagon);
-    Items.Add(SGridTypeSquare);
-    Items.Add(SGridTypeTriangle);
-    Items.Add(SGridTypeRandom);
-    Items.Add(SGridTypeIsometric);
+    Items.AddObject(SGridTypeHexagonVertical, TObject(mtHexagonVertical));
+    Items.AddObject(SGridTypeHexagonHorizontal, TObject(mtHexagonHorizontal));
+    Items.AddObject(SGridTypeSquare, TObject(mtSquare));
+    Items.AddObject(SGridTypeTriangle, TObject(mtTriangle));
+    Items.AddObject(SGridTypeRandom, TObject(mtRandom));
+    Items.AddObject(SGridTypeIsometric, TObject(mtIsometric));
     ItemIndex := LastIndex;
   end;
@@ -462 +460 @@
   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));
   EditImageFile.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
   ButtonImageBrowse.Enabled := ComboBoxMapShape.ItemIndex = Integer(msImage);
@@ -544 +546 @@
 end;
 
+procedure TFormNew.ComboBoxGameSystemChange(Sender: TObject);
+begin
+  UpdateInterface;
+  MapPreviewRedraw;
+end;
+
 procedure TFormNew.ComboBoxGridTypeChange(Sender: TObject);
 begin