Changeset 156 for trunk

Timestamp:

Nov 16, 2017, 6:08:29 PM (7 years ago)

Author:

chronos

Message:

• Modified: Improved code for symetric map generation.

Location:

trunk

Files:

• UGame.pas (modified) (17 diffs)
• UMap.pas (modified) (4 diffs)

trunk/UGame.pas

@@ -112 +112 @@
     Map: TMap;
     function FindByCells(Cell1, Cell2: TCell): TCellLink;
+    function AddLink(Cell1, Cell2: TCell): TCellLink;
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -204 +205 @@
     procedure ComputePlayerStats; virtual;
     procedure Generate; virtual;
+    procedure MakeSymetric;
     procedure Clear;
     constructor Create; virtual;
@@ -734 +736 @@
 var
   I: Integer;
-  LastState: Boolean;
 begin
   for I := 0 to Cells.Count - 1 do begin
@@ -743 +744 @@
   end;
   FreeAndNil(Cells);
-  if Assigned(Map) then begin
-    // To remove itself from list we need disable owning to not be called twice
-    try
-      LastState := Map.CellLinks.FreeObjects;
-      Map.CellLinks.FreeObjects := False;
-      Map.CellLinks.Remove(Self);
-    finally
-      Map.CellLinks.FreeObjects := LastState;
-    end;
-  end;
   inherited Destroy;
 end;
@@ -772 +763 @@
   if I < Count then Result := TCellLink(Items[I])
     else Result := nil;
+end;
+
+function TCellLinks.AddLink(Cell1, Cell2: TCell): TCellLink;
+begin
+  Result := TCellLink.Create;
+  Cell1.Neighbors.Add(Cell2);
+  Cell1.Links.Add(Result);
+  Cell2.Neighbors.Add(Cell1);
+  Cell2.Links.Add(Result);
+  SetLength(Result.Points, 2);
+  Result.Cells.Add(Cell1);
+  Result.Points[0] := Cell1.PosPx;
+  Result.Cells.Add(Cell2);
+  Result.Points[1] := Cell2.PosPx;
+  Result.Map := Map;
+  Map.CellLinks.Add(Result);
 end;
 
@@ -962 +969 @@
 var
   I: Integer;
-  C: Integer;
   Cell: TPlayerCell;
   PosFrom, PosTo: TPoint;
@@ -1596 +1602 @@
   NewCell: TCell;
 begin
-  // Free previous
-  Cells.Count := 0;
+  Clear;
+
   // Allocate and init new
   Cells.Count := FSize.Y * FSize.X;
@@ -1611 +1617 @@
 end;
 
+procedure TMap.MakeSymetric;
+var
+  C: Integer;
+  CellLink: TCellLink;
+  OtherCell1: TCell;
+  OtherCell2: TCell;
+  OppositeCell: TCell;
+begin
+  // Generic way to create two sides symetric map independent to shape
+  for C := 0 to (Cells.Count div 2) - 1 do begin
+    TCell(Cells[C]).Terrain := TCell(Cells[Cells.Count - 1 - C]).Terrain;
+    TCell(Cells[C]).Power := TCell(Cells[Cells.Count - 1 - C]).Power;
+
+    Continue; // TODO
+
+    for CellLink in TCell(Cells[C]).Links do
+      CellLinks.Remove(CellLink);
+    TCell(Cells[C]).Links.Clear;
+    OppositeCell := TCell(Cells[Cells.Count - 1 - C]);
+    for CellLink in OppositeCell.Links do begin
+      OtherCell1 := Cells[Cells.Count - 1 - Cells.IndexOf(CellLink.Cells[0])];
+      OtherCell2 := Cells[Cells.Count - 1 - Cells.IndexOf(CellLink.Cells[1])];
+      CellLinks.AddLink(OtherCell1, OtherCell2);
+    end;
+  end;
+end;
+
 procedure TMap.Clear;
 begin
   CellLinks.Clear;
   Cells.Clear;
+  FNewCellId := 1;
 end;
 
@@ -1968 +2002 @@
   FreeAndNil(MovesTo);
   for I := Links.Count - 1 downto 0 do
-    TCellLink(Links[I]).Free;
+    FMap.CellLinks.Remove(Links[I]);
   FreeAndNil(Links);
   for I := Neighbors.Count - 1 downto 0 do
@@ -2037 +2071 @@
 var
   NewNode: TDOMNode;
-  Move: TUnitMove;
 begin
   Id := ReadInteger(Node, 'Id', 0);
@@ -2648 +2681 @@
 procedure TPlayer.MoveAll;
 var
-  I: Integer;
   AttackerPower: Integer;
   DefenderPower: Integer;
@@ -2915 +2947 @@
   I: Integer;
   J: Integer;
-  NewLink: TCellLink;
 begin
   List := TCells.Create;
@@ -2948 +2979 @@
         // Check if link doesn't exist already
         if not Assigned(FoundCell1.Links.FindByCells(FoundCell1, FoundCell2)) then begin
-          NewLink := TCellLink.Create;
-          FoundCell1.Neighbors.Add(FoundCell2);
-          FoundCell1.Links.Add(NewLink);
-          FoundCell2.Neighbors.Add(FoundCell1);
-          FoundCell2.Links.Add(NewLink);
-          SetLength(NewLink.Points, 2);
-          NewLink.Cells.Add(FoundCell1);
-          NewLink.Points[0] := FoundCell1.PosPx;
-          NewLink.Cells.Add(FoundCell2);
-          NewLink.Points[1] := FoundCell2.PosPx;
-          NewLink.Map := Map;
-          Map.CellLinks.Add(NewLink);
+          Map.CellLinks.AddLink(FoundCell1, FoundCell2);
           Inc(BridgeCount);
         end;
@@ -3152 +3172 @@
   RootNode: TDOMNode;
   I: Integer;
-  Move: TUnitMove;
 begin
   Self.FileName := FileName;
@@ -3404 +3423 @@
 var
   I: Integer;
-  C: Integer;
   LastAreaCount: Integer;
   Player: TPlayer;
@@ -3426 +3444 @@
   end;
 
-  if SymetricMap then begin
-    for C := 0 to (Map.Cells.Count div 2) - 1 do begin
-      TCell(Map.Cells[C]).Terrain :=
-        TCell(Map.Cells[Map.Cells.Count - 1 - C]).Terrain;
-      TCell(Map.Cells[C]).Power :=
-        TCell(Map.Cells[Map.Cells.Count - 1 - C]).Power;
-    end;
-  end;
+  if SymetricMap then Map.MakeSymetric;
 
   Players.Assign(PlayersSetting);
@@ -3468 +3479 @@
 var
   I: Integer;
-  C: Integer;
   Cell: TCell;
   PosFrom, PosTo: TPoint;

trunk/UMap.pas

@@ -146 +146 @@
   PX, PY: Double;
 begin
-  // Free previous
-  Cells.Count := 0;
-  FNewCellId := 1;
+  Clear;
 
   // Allocate and init new
@@ -185 +183 @@
   NewCell: TCell;
 begin
-  // Free previous
-  Cells.Count := 0;
-  FNewCellId := 1;
+  Clear;
+
   // Allocate and init new
   Cells.Count := Size.Y * Size.X;
@@ -244 +241 @@
   NewCell: TCell;
 begin
-  // Free previous
-  Cells.Count := 0;
-  FNewCellId := 1;
+  Clear;
+
   // Allocate and init new
   Cells.Count := Size.Y * Size.X;
@@ -290 +286 @@
   NewCell: TCell;
 begin
-  // Free previous
-  Cells.Count := 0;
-  FNewCellId := 1;
+  Clear;
+
   // Allocate and init new
   Cells.Count := Size.Y * Size.X;