Changeset 39 for trunk/Forms

Timestamp:

Mar 10, 2014, 11:01:14 PM (11 years ago)

Author:

chronos

Message:

• Added: Option to create hexagonal or square map. This is implemented using object inheritance and virtual methods of class TMap.
• Added: Dummy actions to load and save map.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.pas (modified) (2 diffs)
• UFormNew.lfm (modified) (7 diffs)
• UFormNew.lrt (modified) (1 diff)
• UFormNew.pas (modified) (3 diffs)

trunk/Forms/UFormMain.lfm

@@ -101 +101 @@
         Action = Core.AGameEndTurn
       end
+      object MenuItem14: TMenuItem
+        Action = Core.AGameLoad
+      end
+      object MenuItem15: TMenuItem
+        Action = Core.AGameSave
+      end
       object MenuItem5: TMenuItem
         Caption = '-'

trunk/Forms/UFormMain.pas

@@ -27 +27 @@
     MenuItem12: TMenuItem;
     MenuItem13: TMenuItem;
+    MenuItem14: TMenuItem;
+    MenuItem15: TMenuItem;
     MenuItem2: TMenuItem;
     MenuItem3: TMenuItem;
@@ -242 +244 @@
     if Assigned(Cell) then begin
       Core.Game.CurrentPlayer.View.FocusedCell := Cell;
-      StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.Pos.X) + ', ' + IntToStr(Cell.Pos.Y) + '] (' + IntToStr(Cell.MovesFrom.Count) + ', ' + IntToStr(Cell.MovesTo.Count) + ')';
+      StatusBar1.Panels[0].Text := '[' + IntToStr(Cell.Pos.X) + ', ' + IntToStr(Cell.Pos.Y) +
+        '] (' + IntToStr(Cell.MovesFrom.Count) + ', ' + IntToStr(Cell.MovesTo.Count) + ')';
     end else begin
       Core.Game.CurrentPlayer.View.FocusedCell := nil;

trunk/Forms/UFormNew.lfm

@@ -35 +35 @@
     Height = 24
     Top = 276
-    Width = 194
+    Width = 175
     Caption = 'Inaccessible places'
     OnChange = CheckBoxVoidChange
@@ -92 +92 @@
     Height = 22
     Top = 184
-    Width = 99
+    Width = 88
     Caption = 'Map width:'
     ParentColor = False
@@ -139 +139 @@
     Height = 22
     Top = 277
-    Width = 17
+    Width = 15
     Caption = '%'
     ParentColor = False
@@ -173 +173 @@
     Height = 22
     Top = 232
-    Width = 106
+    Width = 94
     Caption = 'Map height:'
     ParentColor = False
@@ -181 +181 @@
     Height = 24
     Top = 316
-    Width = 73
+    Width = 68
     Caption = 'Cities'
     OnChange = CheckBoxCityChange
@@ -199 +199 @@
     Height = 22
     Top = 317
-    Width = 17
+    Width = 15
     Caption = '%'
     ParentColor = False
@@ -248 +248 @@
     TabOrder = 15
   end
+  object ComboBoxGridType: TComboBox
+    Left = 320
+    Height = 32
+    Top = 376
+    Width = 208
+    ItemHeight = 0
+    Items.Strings = (
+      'Hexagonal'
+      'Square'
+    )
+    Style = csDropDownList
+    TabOrder = 16
+  end
+  object Label5: TLabel
+    Left = 224
+    Height = 22
+    Top = 376
+    Width = 79
+    Caption = 'Grid type:'
+    ParentColor = False
+  end
 end

trunk/Forms/UFormNew.lrt

@@ -17 +17 @@
 TFORMNEW.RADIOGROUPGROWAMOUNT.CAPTION=Per turn grow amount
 TFORMNEW.RADIOGROUPGROWCELLS.CAPTION=Growing cells
+TFORMNEW.LABEL5.CAPTION=Grid type:

trunk/Forms/UFormNew.pas

@@ -21 +21 @@
     CheckBoxVoid: TCheckBox;
     CheckBoxCity: TCheckBox;
+    ComboBoxGridType: TComboBox;
     Label1: TLabel;
     Label2: TLabel;
     Label3: TLabel;
     Label4: TLabel;
+    Label5: TLabel;
     ListView1: TListView;
     RadioGroupGrowCells: TRadioGroup;
@@ -194 +196 @@
   RadioGroupGrowAmount.ItemIndex := Integer(Game.GrowAmount);
   RadioGroupGrowCells.ItemIndex := Integer(Game.GrowCells);
+  ComboBoxGridType.ItemIndex := Integer(Game.MapType) - 1;
 end;
 
@@ -215 +218 @@
   Game.GrowAmount := TGrowAmount(RadioGroupGrowAmount.ItemIndex);
   Game.GrowCells := TGrowCells(RadioGroupGrowCells.ItemIndex);
+  Game.MapType := TMapType(ComboBoxGridType.ItemIndex + 1);
 end;