Changeset 76

Timestamp:

Oct 5, 2014, 1:34:43 PM (10 years ago)

Author:

chronos

Message:

• Modified: More changes to support game load from file.
• Fixed: Require at least one player in new game.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (1 diff)
• Forms/UFormNew.pas (modified) (4 diffs)
• Languages/xtactics.cs.po (modified) (9 diffs)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (42 diffs)

trunk/Forms/UFormMain.lfm

@@ -91 +91 @@
       Style = tbsSeparator
     end
+    object ToolButton10: TToolButton
+      Left = 1
+      Top = 268
+      Width = 32
+      Style = tbsSeparator
+    end
+    object ToolButton11: TToolButton
+      Left = 1
+      Top = 278
+      Action = Core.AGameLoad
+    end
+    object ToolButton12: TToolButton
+      Left = 1
+      Top = 310
+      Action = Core.AGameSave
+    end
+    object ToolButton13: TToolButton
+      Left = 1
+      Top = 342
+      Action = Core.AExit
+    end
   end
   object PaintBox1: TPaintBox

trunk/Forms/UFormMain.pas

@@ -53 +53 @@
     ToolBar1: TToolBar;
     ToolButton1: TToolButton;
+    ToolButton10: TToolButton;
+    ToolButton11: TToolButton;
+    ToolButton12: TToolButton;
+    ToolButton13: TToolButton;
     ToolButton2: TToolButton;
     ToolButton3: TToolButton;

trunk/Forms/UFormNew.pas

@@ -228 +228 @@
   ListView1.Items.Count := Players.Count;
   ListView1.Refresh;
-  ButtonPlayerRemove.Enabled := Assigned(ListView1.Selected);
+  ButtonPlayerRemove.Enabled := Assigned(ListView1.Selected) and (Players.Count > 1);
   ButtonPlayerAdd.Enabled := Players.Count < MaxPlayerCount;
   APlayerModify.Enabled := Assigned(ListView1.Selected);
@@ -306 +306 @@
   if Players.Count <= (MaxPlayerCount - 1) then begin
     NewPlayer := TPlayer.Create;
-    NewPlayer.Name := 'Player ' + IntToStr(Players.Count + 1);
+    NewPlayer.Id := Players.GetNewPlayerId;
+    NewPlayer.Name := SPlayer + ' ' + IntToStr(NewPlayer.Id);
     NewPlayer.Color := PlayerColors[Players.Count];
     NewPlayer.Mode := pmComputer;
@@ -335 +336 @@
     TPlayer(Players[I]).Assign(TPlayer(Game.Players[I]));
   end;
+  Players.NewPlayerId := Game.Players.NewPlayerId;
+
   CheckBoxCity.Checked := Game.CityEnabled;
   SpinEditCityPercent.Value := Game.CityPercentage;
@@ -362 +365 @@
     TPlayer(Game.Players[I]).Game := Game;
   end;
+  Game.Players.NewPlayerId := Players.NewPlayerId;
   Game.SymetricMap := CheckBoxSymetricMap.Checked;
   Game.VoidEnabled := CheckBoxVoid.Checked;

trunk/Languages/xtactics.cs.po

@@ -195 +195 @@
 
 #: tformnew.aplayeradd.caption
-#, fuzzy
 #| msgid "Add player"
 msgid "Add"
-msgstr "Přidat hráče"
+msgstr "Přidat"
 
 #: tformnew.aplayermodify.caption
@@ -205 +204 @@
 
 #: tformnew.aplayerremove.caption
-#, fuzzy
 #| msgid "Remove player"
 msgid "Remove"
-msgstr "Odstranit hráče"
+msgstr "Odstranit"
 
 #: tformnew.buttoncancel.caption
@@ -218 +216 @@
 msgctxt "tformnew.buttonimagebrowse.caption"
 msgid "Browse"
-msgstr ""
+msgstr "Vybrat"
 
 #: tformnew.buttonok.caption
@@ -280 +278 @@
 #: tformnew.label8.caption
 msgid "Map shape:"
-msgstr ""
+msgstr "Tvar mapy"
 
 #: tformnew.label9.caption
 msgid "Image file:"
-msgstr ""
+msgstr "Soubor obrázku:"
 
 #: tformnew.listview1.columns[0].caption
@@ -312 +310 @@
 #: tformnew.tabsheet1.caption
 msgid "Players"
-msgstr ""
+msgstr "Hráči"
 
 #: tformnew.tabsheet2.caption
 msgid "Map"
-msgstr ""
+msgstr "Mapa"
 
 #: tformnew.tabsheet3.caption
 msgid "Rules"
-msgstr ""
+msgstr "Pravidla"
 
 #: tformplayer.buttoncancel.caption
@@ -437 +435 @@
 #: uformnew.sfromimagefile
 msgid "From image file"
-msgstr ""
+msgstr "Obrázek ze souboru"
 
 #: uformnew.sgridtypehexagon
@@ -477 +475 @@
 #: uformnew.srectangular
 msgid "Rectangular"
-msgstr ""
+msgstr "Obdelníkový"
 
 #: uformnew.swinobjectivecaptureposition
@@ -525 +523 @@
 #: ugame.snewgamefile
 msgid "New game.xtg"
-msgstr "Nová hry.xtg"
+msgstr "Nová hra.xtg"
 
 #: ugame.splayer
@@ -539 +537 @@
 msgid "Wrong file format"
 msgstr "Chybný formát souboru"
-

trunk/UCore.pas

@@ -187 +187 @@
     Game.LoadFromFile(OpenDialog1.FileName);
     LastMapFileName := OpenDialog1.FileName;
+    with Core.Game.CurrentPlayer do
+      View.DestRect := Bounds(0, 0, FormMain.PaintBox1.Width, FormMain.PaintBox1.Height);
+    FormMain.AZoomAll.Execute;
     FormMain.Redraw;
   end;

trunk/UGame.pas

@@ -24 +24 @@
   TView = class;
   TUnitMoves = class;
+  TCells = class;
 
   TFloatPoint = record
@@ -47 +48 @@
     MovesFrom: TUnitMoves;
     MovesTo: TUnitMoves;
-    Neighbors: TObjectList; // TList<TCell>
+    Neighbors: TCells;
     Mark: Boolean;
+    procedure LoadFromNode(Node: TDOMNode);
+    procedure SaveToNode(Node: TDOMNode);
     procedure Assign(Source: TCell);
     function IsVisible(View: TView): Boolean;
@@ -60 +63 @@
 
   TCellArray = array of TCell;
+
+  { TCells }
+
   TCells = class(TObjectList)
-
+    function FindById(Id: Integer): TCell;
+    procedure LoadFromNode(Node: TDOMNode);
+    procedure SaveToNode(Node: TDOMNode);
   end;
 
@@ -98 +106 @@
   private
     FSize: TPoint;
+    FNewCellId: Integer;
     function GetSize: TPoint; virtual;
     procedure PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
@@ -104 +113 @@
       Text: string);
     procedure SetSize(AValue: TPoint); virtual;
+    function GetNewCellId: Integer; virtual;
   public
     Game: TGame;
     MaxPower: Integer;
     DefaultCellSize: TPoint;
-    Cells: TObjectList; // TList<TCell>
+    Cells: TCells;
     Shape: TMapShape;
     Image: TImage;
@@ -139 +149 @@
   private
     function IsCellsPosNeighbor(CellPos1, CellPos2: TPoint): Boolean;
-    function GetCellPosNeighbors(CellPos: TPoint): TCellArray;
+    procedure GetCellPosNeighbors(CellPos: TPoint; Neighbours: TCells);
     function GetHexagonPolygon(Pos: TPoint; Size: TPoint): TPointArray;
   public
@@ -223 +233 @@
 
   TPlayers = class(TObjectList)
+    Game: TGame;
+    NewPlayerId: Integer;
+    procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
+    function GetNewPlayerId: Integer;
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
+    constructor Create;
   end;
 
@@ -236 +251 @@
     procedure SetCellTo(AValue: TCell);
   public
-    List: TObjectList; // TList<TUnitMove>
+    List: TUnitMoves;
     CountOnce: Integer;
     CountRepeat: Integer;
@@ -250 +265 @@
 
   TUnitMoves = class(TObjectList)
+    Game: TGame;
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -331 +347 @@
 function FloatPoint(AX, AY: Double): TFloatPoint;
 
+resourcestring
+  SPlayer = 'Player';
+
 
 implementation
@@ -336 +355 @@
 resourcestring
   SMinimumPlayers = 'You need at least two players';
-  SPlayer = 'Player';
   SHuman = 'Human';
   SComputer = 'Computer';
@@ -407 +425 @@
 end;
 
-{ TComputer }
+{ TCells }
+
+function TCells.FindById(Id: Integer): TCell;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < 0) and (TCell(Items[I]).Id <> Id) do Inc(I);
+  if I < Count then Result := TCell(Items[I])
+    else Result := nil;
+end;
+
+procedure TCells.LoadFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  NewCell: TCell;
+begin
+  Count := 0;
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'Cell') do begin
+    NewCell := TCell.Create;
+    NewCell.LoadFromNode(Node2);
+    Add(NewCell);
+    Node2 := Node2.NextSibling;
+  end;
+end;
+
+procedure TCells.SaveToNode(Node: TDOMNode);
+var
+  I: Integer;
+  NewNode2: TDOMNode;
+begin
+  for I := 0 to Count - 1 do
+  with TCell(Items[I]) do begin
+    NewNode2 := Node.OwnerDocument.CreateElement('Cell');
+    Node.AppendChild(NewNode2);
+    SaveToNode(NewNode2);
+  end;
+end;
 
 { TPlayers }
 
+procedure TPlayers.New(Name: string; Color: TColor; Mode: TPlayerMode);
+var
+  NewPlayer: TPlayer;
+begin
+  NewPlayer := TPlayer.Create;
+  NewPlayer.Game := Game;
+  NewPlayer.Name := Name;
+  NewPlayer.Color := Color;
+  NewPlayer.Mode := Mode;
+  NewPlayer.Id := GetNewPlayerId;
+  Add(NewPlayer);
+end;
+
+function TPlayers.GetNewPlayerId: Integer;
+begin
+  Result := NewPlayerId;
+  Inc(NewPlayerId);
+end;
+
 procedure TPlayers.LoadFromNode(Node: TDOMNode);
-begin
-
+var
+  Node2: TDOMNode;
+  NewPlayer: TPlayer;
+begin
+  Count := 0;
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'Player') do begin
+    NewPlayer := TPlayer.Create;
+    NewPlayer.Game := Game;
+    NewPlayer.LoadFromNode(Node2);
+    Add(NewPlayer);
+    Node2 := Node2.NextSibling;
+  end;
 end;
 
@@ -428 +514 @@
 end;
 
+constructor TPlayers.Create;
+begin
+  inherited Create;
+  NewPlayerId := 1;
+end;
+
 { TUnitMoves }
 
 procedure TUnitMoves.LoadFromNode(Node: TDOMNode);
-begin
-
+var
+  Node2: TDOMNode;
+  NewUnitMove: TUnitMove;
+begin
+  Count := 0;
+  Node2 := Node.FirstChild;
+  while Assigned(Node2) and (Node2.NodeName = 'UnitMove') do begin
+    NewUnitMove := TUnitMove.Create;
+    NewUnitMove.List := Self;
+    NewUnitMove.LoadFromNode(Node2);
+    Add(NewUnitMove);
+    Node2 := Node2.NextSibling;
+  end;
 end;
 
@@ -463 +566 @@
   Pos: TPoint;
 begin
-  inherited;
   // Free previous
   Cells.Count := 0;
+  FNewCellId := 1;
   // Allocate and init new
   Cells.Count := FSize.Y * FSize.X;
@@ -474 +577 @@
     SetLength(NewCell.Polygon, 1);
     NewCell.Polygon[0] := NewCell.PosPx;
+    NewCell.Id := GetNewCellId;
     Cells[Y * FSize.X + X] := NewCell;
   end;
@@ -506 +610 @@
   NewCell: TCell;
 begin
-  inherited;
   // Free previous
   Cells.Count := 0;
+  FNewCellId := 1;
   // Allocate and init new
   Cells.Count := FSize.Y * FSize.X;
@@ -520 +624 @@
       Trunc((Y * DefaultCellSize.Y * TriangleCellMulY) - (0.1 * Rev * DefaultCellSize.Y)));
     NewCell.Polygon := GetTrianglePolygon(NewCell.PosPx, DefaultCellSize, Reverse);
+    NewCell.Id := GetNewCellId;
     Cells[Y * FSize.X + X] := NewCell;
   end;
@@ -545 +650 @@
   NewCell: TCell;
 begin
-  inherited;
   // Free previous
   Cells.Count := 0;
+  FNewCellId := 1;
   // Allocate and init new
   Cells.Count := FSize.Y * FSize.X;
@@ -556 +661 @@
       Trunc(Y * DefaultCellSize.Y * SquareCellMulY));
     NewCell.Polygon := GetSquarePolygon(NewCell.PosPx, DefaultCellSize);
+    NewCell.Id := GetNewCellId;
     Cells[Y * FSize.X + X] := NewCell;
   end;
+
   // Generate neighbours
   for Y := 0 to FSize.Y - 1 do
@@ -601 +708 @@
     Generate;
   end;
+end;
+
+function TMap.GetNewCellId: Integer;
+begin
+  Result := FNewCellId;
+  Inc(FNewCellId);
 end;
 
@@ -708 +821 @@
 
 procedure TMap.LoadFromNode(Node: TDOMNode);
-begin
+var
+  Node2: TDOMNode;
+begin
+  Size := Point(ReadInteger(Node, 'SizeX', 0), ReadInteger(Node, 'SizeY', 0));
   DefaultCellSize.X := ReadInteger(Node, 'DefaultCellSizeX', 1);
   DefaultCellSize.Y := ReadInteger(Node, 'DefaultCellSizeY', 1);
   MaxPower := ReadInteger(Node, 'MaxPower', 99);
   Shape := TMapShape(ReadInteger(Node, 'Shape', Integer(msRectangle)));
+  Node2 := Node.FindNode('Cells');
+  if Assigned(Node2) then
+    Cells.LoadFromNode(Node2);
 end;
 
@@ -725 +844 @@
   WriteInteger(Node, 'MaxPower', MaxPower);
   WriteInteger(Node, 'Shape', Integer(Shape));
+  WriteInteger(Node, 'SizeX', Size.X);
+  WriteInteger(Node, 'SizeY', Size.Y);
   NewNode := Node.OwnerDocument.CreateElement('Cells');
   Node.AppendChild(NewNode);
-  for I := 0 to Cells.Count - 1 do
-  with TCell(Cells[I]) do begin
-    NewNode2 := Node.OwnerDocument.CreateElement('Cell');
-    NewNode.AppendChild(NewNode2);
-    WriteInteger(NewNode2, 'Id', I);
-    WriteInteger(NewNode2, 'Power', Power);
-    WriteInteger(NewNode2, 'Terrain', Integer(Terrain));
-    WriteInteger(NewNode2, 'PosX', PosPx.X);
-    WriteInteger(NewNode2, 'PosY', PosPx.Y);
-  end;
+  Cells.SaveToNode(NewNode);
 end;
 
@@ -840 +952 @@
   NeighCells: TCellArray;
 begin
-  inherited;
   // Free previous
   Cells.Count := 0;
   // Allocate and init new
   Cells.Count := FSize.Y * FSize.X;
+  FNewCellId := 1;
   for Y := 0 to FSize.Y - 1 do
   for X := 0 to FSize.X - 1 do begin
     NewCell := TCell.Create;
     NewCell.PosPx := Point(X, Y);
+    NewCell.Id := GetNewCellId;
     Cells[Y * FSize.X + X] := NewCell;
   end;
@@ -857 +970 @@
   MaxPower := 99;
   DefaultCellSize := Point(220, 220);
-  Cells := TObjectList.create;
+  Cells := TCells.create;
   Size := Point(0, 0);
   Image := TImage.Create(nil);
@@ -942 +1055 @@
   CountOnce := ReadInteger(Node, 'CountOnce', 0);
   CountRepeat := ReadInteger(Node, 'CountRepeat', 0);
-  //CellFrom := ReadInteger(Node, 'CellFrom', 0);
-  //CellTo := ReadInteger(Node, 'CellTo', 0);
+  CellFrom := List.Game.Map.Cells.FindById(ReadInteger(Node, 'CellFrom', 0));
+  CellTo := List.Game.Map.Cells.FindById(ReadInteger(Node, 'CellTo', 0));
 end;
 
@@ -956 +1069 @@
 constructor TUnitMove.Create;
 begin
+  List := nil; // Is later set to parent list owning item
   FCellFrom := nil;
   FCellTo := nil;
@@ -1031 +1145 @@
 end;
 
+procedure TCell.LoadFromNode(Node: TDOMNode);
+var
+  Node2: TDOMNode;
+  Node3: TDOMNode;
+  NewCell: TCell;
+begin
+  Id := ReadInteger(Node, 'Id', 0);
+  Power := ReadInteger(Node, 'Power', 0);
+  Terrain := TTerrainType(ReadInteger(Node, 'Terrain', Integer(ttVoid)));
+  PosPx.X := ReadInteger(Node, 'PosX', 0);
+  PosPx.Y := ReadInteger(Node, 'PosY', 0);
+  //Player := Map.Game.Players.FindById(ReadInteger(Node, 'Player', 0));
+
+  Node3 := Node.FindNode('Polygon');
+  if Assigned(Node3) then begin
+    SetLength(Polygon, 0);
+    Node2 := Node3.FirstChild;
+    while Assigned(Node2) and (Node2.NodeName = 'Point') do begin
+      SetLength(Polygon, Length(Polygon) + 1);
+      Polygon[High(Polygon)].X := ReadInteger(Node2, 'X', 0);
+      Polygon[High(Polygon)].Y := ReadInteger(Node2, 'Y', 0);
+      Node2 := Node2.NextSibling;
+    end;
+  end;
+end;
+
+procedure TCell.SaveToNode(Node: TDOMNode);
+var
+  NewNode: TDOMNode;
+  NewNode2: TDOMNode;
+  I: Integer;
+begin
+  WriteInteger(Node, 'Id', Id);
+  WriteInteger(Node, 'Power', Power);
+  WriteInteger(Node, 'Terrain', Integer(Terrain));
+  WriteInteger(Node, 'PosX', PosPx.X);
+  WriteInteger(Node, 'PosY', PosPx.Y);
+  if Assigned(Player) then
+    WriteInteger(Node, 'Player', Player.Id)
+    else WriteInteger(Node, 'Player', 0);
+  NewNode := Node.OwnerDocument.CreateElement('Neighbours');
+  Node.AppendChild(NewNode);
+  for I := 0 to Neighbors.Count - 1 do begin
+    NewNode2 := NewNode.OwnerDocument.CreateElement('Neighbour');
+    NewNode.AppendChild(NewNode2);
+    WriteInteger(NewNode2, 'Id', TCell(Neighbors[I]).Id);
+  end;
+  NewNode := Node.OwnerDocument.CreateElement('Polygon');
+  Node.AppendChild(NewNode);
+  for I := 0 to Length(Polygon) - 1 do begin
+    NewNode2 := NewNode.OwnerDocument.CreateElement('Point');
+    NewNode.AppendChild(NewNode2);
+    WriteInteger(NewNode2, 'X', Polygon[I].X);
+    WriteInteger(NewNode2, 'Y', Polygon[I].Y);
+  end;
+end;
+
 procedure TCell.Assign(Source: TCell);
 begin
+  Id := Source.Id;
   PosPx := Source.PosPx;
   Terrain := Source.Terrain;
@@ -1077 +1249 @@
 begin
   Player := nil;
-  Neighbors := TObjectList.Create;
+  Neighbors := TCells.Create;
   Neighbors.OwnsObjects := False;
   MovesFrom := TUnitMoves.Create;
@@ -1147 +1319 @@
   Color := ReadInteger(Node, 'Color', clSilver);
   Mode := TPlayerMode(ReadInteger(Node, 'Mode', Integer(pmHuman)));
+  StartCell := FGame.Map.Cells.FindById(ReadInteger(Node, 'StartCell', 0));
+  StartUnits := ReadInteger(Node, 'StartUnits', 0);
 end;
 
@@ -1155 +1329 @@
   WriteInteger(Node, 'Color', Color);
   WriteInteger(Node, 'Mode', Integer(Mode));
+  WriteInteger(Node, 'StartCell', StartCell.Id);
+  WriteInteger(Node, 'StartUnits', StartUnits);
 end;
 
@@ -1173 +1349 @@
 procedure TComputer.AttackNeutral;
 var
-  AllCells: TObjectList;
+  AllCells: TCells;
   Cells, Cells2: TCellArray;
   TotalPower: Integer;
@@ -1238 +1414 @@
 procedure TComputer.AttackPlayers;
 var
-  AllCells: TObjectList;
+  AllCells: TCells;
   Cells, Cells2: TCellArray;
   TotalPower: Integer;
@@ -1303 +1479 @@
 procedure TComputer.InnerMoves;
 var
-  AllCells: TObjectList;
+  AllCells: TCells;
   Cells, Cells2: TCellArray;
   I, J: Integer;
@@ -1447 +1623 @@
 procedure TPlayer.Assign(Source: TPlayer);
 begin
+  Id := Source.Id;
   Name := Source.Name;
   Color := Source.Color;
@@ -1794 +1971 @@
       if Assigned(NewNode) then
         Players.LoadFromNode(NewNode);
+      if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
+        else CurrentPlayer := nil;
 
       NewNode := FindNode('UnitMoves');
@@ -1836 +2015 @@
       NewNode := OwnerDocument.CreateElement('Players');
       AppendChild(NewNode);
-      for I := 0 to Players.Count - 1 do begin;
-        NewNode2 := OwnerDocument.CreateElement('Player');
-        NewNode.AppendChild(NewNode2);
-        TPlayer(Players[I]).SaveToNode(NewNode2);
-      end;
+      Players.SaveToNode(NewNode);
 
       NewNode := OwnerDocument.CreateElement('UnitMoves');
@@ -1941 +2116 @@
 
 constructor TGame.Create;
-var
-  Player: TPlayer;
 begin
   Moves := TUnitMoves.Create;
+  Moves.Game := Self;
   Map := TMap.Create;
   Players := TPlayers.Create;
+  Players.Game := Self;
 
   MapImageFileName := 'Images/Maps/WorldMap.png';
-
   Randomize;
 
-  Player := TPlayer.Create;
-  Player.Name := SPlayer + ' 1';
-  Player.Game := Self;
-  Player.Color := clBlue;
-  Players.Add(Player);
-  Player := TPlayer.Create;
-  Player.Name := SPlayer + ' 2';
-  Player.Game := Self;
-  Player.Color := clRed;
-  Player.Mode := pmComputer;
-  Players.Add(Player);
+  Players.New(SPlayer + ' 1', clBlue, pmHuman);
+  Players.New(SPlayer + ' 2', clRed, pmComputer);
 
   VoidEnabled := True;
@@ -2042 +2207 @@
     View.CenterMap;
   end;
-  CurrentPlayer := TPlayer(Players[0]);
+  if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
+    else CurrentPlayer := nil;
 end;
 
@@ -2123 +2289 @@
 end;
 
-function THexMap.GetCellPosNeighbors(CellPos: TPoint): TCellArray;
+procedure THexMap.GetCellPosNeighbors(CellPos: TPoint; Neighbours: TCells);
 var
   X, Y: Integer;
 begin
-  SetLength(Result, 0);
+  Neighbours.Count := 0;
   for Y := -1 to 1 do
   for X := -1 to 1 do
   if IsValidIndex(Point(CellPos.X + X, CellPos.Y + Y)) and
   IsCellsPosNeighbor(CellPos, Point((CellPos.X + X), (CellPos.Y + Y))) then begin
-    SetLength(Result, Length(Result) + 1);
-    Result[Length(Result) - 1] := TCell(Cells[(CellPos.Y + Y) * FSize.X + (CellPos.X + X)]);
+    Neighbours.Add(TCell(Cells[(CellPos.Y + Y) * FSize.X + (CellPos.X + X)]));
   end;
 end;
@@ -2189 +2354 @@
   I: Integer;
   NewCell: TCell;
-  NeighCells: TCellArray;
   PX, PY: Double;
 begin
-  inherited;
   // Free previous
   Cells.Count := 0;
+  FNewCellId := 1;
   // Allocate and init new
   Cells.Count := FSize.Y * FSize.X;
@@ -2209 +2373 @@
       Trunc(PY * DefaultCellSize.Y / HexCellMulY));
     NewCell.Polygon := GetHexagonPolygon(NewCell.PosPx, DefaultCellSize);
+    NewCell.Id := GetNewCellId;
     Cells[Y * FSize.X + X] := NewCell;
   end;
@@ -2216 +2381 @@
   for X := 0 to FSize.X - 1 do
   with TCell(Cells[Y * FSize.X + X]) do begin
-    NeighCells := GetCellPosNeighbors(Point(X, Y));
-    Neighbors.Count := Length(NeighCells);
-    for I := 0 to Length(NeighCells) - 1 do
-      Neighbors[I] := NeighCells[I];
+    GetCellPosNeighbors(Point(X, Y), Neighbors);
   end;
 end;
 
 end.
-