Changeset 157

Timestamp:

Nov 16, 2017, 10:32:12 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Build cell bridges correctly if symetric map is selected.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (2 diffs)
• UGame.pas (modified) (17 diffs)

trunk/Forms/UFormMain.lfm

@@ -36 +36 @@
     Height = 557
     Top = 0
-    Width = 80
+    Width = 32
     Align = alLeft
     ButtonHeight = 32
@@ -114 +114 @@
   end
   object PaintBox1: TPaintBox
-    Left = 80
+    Left = 32
     Height = 557
     Top = 0
-    Width = 695
+    Width = 743
     Align = alClient
     OnMouseDown = PaintBox1MouseDown

trunk/UGame.pas

@@ -98 +98 @@
 
   TCellLink = class
+    Allocated: Boolean;
     Points: array of TPoint;
     Cells: TCells;
@@ -179 +180 @@
     procedure DrawArrow(Canvas: TCanvas; View: TView; Pos: TPoint; Angle: Double;
       Text: string);
+    function SearchDifferentCellArea(List: TCells; SourceArea,
+      DestArea: TMapArea): TCell;
     procedure SetSize(AValue: TPoint); virtual;
   protected
@@ -205 +208 @@
     procedure ComputePlayerStats; virtual;
     procedure Generate; virtual;
+    procedure BuildMapAreas;
+    procedure BuildBridges;
     procedure MakeSymetric;
+    procedure CreateLinks;
     procedure Clear;
     constructor Create; virtual;
@@ -438 +444 @@
     procedure SetMapType(AValue: TMapType);
     procedure SetRunning(AValue: Boolean);
-    function SearchDifferentCellArea(List: TCells; SourceArea, DestArea: TMapArea): TCell;
     procedure BuildTerrain;
-    procedure BuildBridges;
-    procedure BuildMapAreas;
     procedure InitClients;
     procedure SelectPlayerStartCell(Player: TPlayer);
@@ -729 +732 @@
 constructor TCellLink.Create;
 begin
+  Allocated := True;
   Cells := TCells.Create;
   Cells.FreeObjects := False;
@@ -735 +739 @@
 destructor TCellLink.Destroy;
 var
+  Links: TCellLinks;
+  FirstLink: TCellLink;
   I: Integer;
 begin
@@ -740 +746 @@
     if TCell(Cells[I]).Neighbors.Remove(TCell(Cells[1 - I])) = -1 then
       raise Exception.Create(SCellRemoveNeighborError);
+    Links := TCell(Cells[I]).Links;
+    if Links.Count > 0 then
+    FirstLink := TCellLink(Links[0]);
     if TCell(Cells[I]).Links.Remove(Self) = -1 then
       raise Exception.Create(SCellRemoveNeighborError);
   end;
   FreeAndNil(Cells);
+  Allocated := False;
   inherited Destroy;
 end;
@@ -755 +765 @@
   I := 0;
   while (I < Count) do begin
-    if (TCellLink(Items[I]).Cells[0] = Cell1) and (TCellLink(Items[I]).Cells[1] = Cell2) then
-      Break;
-    if (TCellLink(Items[I]).Cells[0] = Cell2) and (TCellLink(Items[I]).Cells[1] = Cell1) then
+    if ((TCellLink(Items[I]).Cells[0] = Cell1) and (TCellLink(Items[I]).Cells[1] = Cell2)) or
+    ((TCellLink(Items[I]).Cells[0] = Cell2) and (TCellLink(Items[I]).Cells[1] = Cell1)) then
       Break;
     Inc(I);
@@ -1355 +1364 @@
     msRounded: begin
       Rect := GetPixelRect;
-      Center := Point(Rect.Left + Rect.Width div 2, Rect.Top + Rect.Height div 2);
-      Result := Sqr(Coord.X - Center.X) / Sqr(Rect.Width div 2) +
-        Sqr(Coord.Y - Center.Y) / Sqr(Rect.Height div 2) > 1;
+      Center := Point(Rect.Left + (Rect.Right - Rect.Left) div 2,
+        Rect.Top + (Rect.Bottom - Rect.Top) div 2);
+      Result := Sqr(Coord.X - Center.X) / Sqr((Rect.Right - Rect.Left) div 2) +
+        Sqr(Coord.Y - Center.Y) / Sqr((Rect.Bottom - Rect.Top) div 2) > 1;
     end
     else Result := False;
@@ -1620 +1630 @@
 var
   C: Integer;
+  I: Integer;
   CellLink: TCellLink;
   OtherCell1: TCell;
@@ -1630 +1641 @@
     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;
+    for I := TCell(Cells[C]).Links.Count - 1 downto 0 do begin
+      CellLink := TCell(Cells[C]).Links[I];
+
+      // Remove cells on first half of the map
+      if (Cells.IndexOf(CellLink.Cells[0]) <= (Cells.Count div 2)) and
+      (Cells.IndexOf(CellLink.Cells[1]) <= (Cells.Count div 2)) then
+      begin
+        CellLinks.Remove(CellLink);
+        Continue;
+      end;
+
+      // Make cross half links symetric
+      if (Cells.IndexOf(CellLink.Cells[0]) <= (Cells.Count div 2)) and
+      (Cells.IndexOf(CellLink.Cells[1]) >= (Cells.Count div 2)) then begin
+        OtherCell1 := Cells[Cells.Count - 1 - Cells.IndexOf(CellLink.Cells[1])];
+        OtherCell2 := CellLink.Cells[1];
+        CellLinks.Remove(CellLink);
+        if not Assigned(CellLinks.FindByCells(OtherCell1, OtherCell2)) then
+          CellLinks.AddLink(OtherCell1, OtherCell2);
+      end else
+      if (Cells.IndexOf(CellLink.Cells[0]) >= (Cells.Count div 2)) and
+      (Cells.IndexOf(CellLink.Cells[1]) <= (Cells.Count div 2)) then begin
+        OtherCell1 := Cells[Cells.Count - 1 - Cells.IndexOf(CellLink.Cells[0])];
+        OtherCell2 := CellLink.Cells[0];
+        CellLinks.Remove(CellLink);
+        if not Assigned(CellLinks.FindByCells(OtherCell1, OtherCell2)) then
+          CellLinks.AddLink(OtherCell1, OtherCell2);
+      end;
+    end;
+  end;
+
+  for C := 0 to (Cells.Count div 2) - 1 do begin
+    // Make copy of links from second half
     OppositeCell := TCell(Cells[Cells.Count - 1 - C]);
-    for CellLink in OppositeCell.Links do begin
+    for CellLink in OppositeCell.Links do
+      if (Cells.IndexOf(CellLink.Cells[0]) > (Cells.Count div 2)) and
+      (Cells.IndexOf(CellLink.Cells[1]) > (Cells.Count div 2)) then 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;
+      if not Assigned(CellLinks.FindByCells(OtherCell1, OtherCell2)) then
+        CellLinks.AddLink(OtherCell1, OtherCell2);
+    end;
+  end;
+end;
+
+procedure TMap.CreateLinks;
+var
+  LastAreaCount: Integer;
+begin
+  BuildMapAreas;
+  LastAreaCount := -1;
+  while (Areas.Count > 1) and (Areas.Count <> LastAreaCount) do begin
+    LastAreaCount := Areas.Count;
+    BuildBridges;
+    BuildMapAreas;
   end;
 end;
@@ -2874 +2929 @@
 end;
 
-function TGame.SearchDifferentCellArea(List: TCells; SourceArea, DestArea: TMapArea): TCell;
+function TMap.SearchDifferentCellArea(List: TCells; SourceArea, DestArea: TMapArea): TCell;
 var
   NewList: TCells;
@@ -2938 +2993 @@
 end;
 
-procedure TGame.BuildBridges;
+procedure TMap.BuildBridges;
 var
   List: TCells;
@@ -2955 +3010 @@
 
   // Build area bridges
-  if Map.Areas.Count > 1 then
-  for I := 0 to Map.Areas.Count - 1 do
-  with TMapArea(Map.Areas[I]) do begin
+  if Areas.Count > 1 then
+  for I := 0 to Areas.Count - 1 do
+  with TMapArea(Areas[I]) do begin
     GetBorderCells(BorderList);
     for J := 0 to 1 do begin
@@ -2991 +3046 @@
 end;
 
-procedure TGame.BuildMapAreas;
+procedure TMap.BuildMapAreas;
 var
   C: Integer;
   NewArea: TMapArea;
 begin
-  for C := 0 to Map.Cells.Count - 1 do
-  with TCell(Map.Cells[C]) do
+  for C := 0 to Cells.Count - 1 do
+  with TCell(Cells[C]) do
     Area := nil;
-  Map.Areas.Clear;
-  for C := 0 to Map.Cells.Count - 1 do
-  with TCell(Map.Cells[C]) do
+  Areas.Clear;
+  for C := 0 to Cells.Count - 1 do
+  with TCell(Cells[C]) do
   if (Terrain <> ttVoid) and (not Assigned(Area)) then begin
     NewArea := TMapArea.Create;
     NewArea.Id := Map.Areas.Count;
     NewArea.Map := Map;
-    Map.Areas.Add(NewArea);
+    Areas.Add(NewArea);
     Area := NewArea;
     AreaExtend;
@@ -3423 +3478 @@
 var
   I: Integer;
-  LastAreaCount: Integer;
   Player: TPlayer;
 begin
@@ -3434 +3488 @@
 
   // Build bridges
-  if BridgeEnabled then begin
-    BuildMapAreas;
-    LastAreaCount := -1;
-    while (Map.Areas.Count > 1) and (Map.Areas.Count <> LastAreaCount) do begin
-      LastAreaCount := Map.Areas.Count;
-      BuildBridges;
-      BuildMapAreas;
-    end;
-  end;
-
-  if SymetricMap then Map.MakeSymetric;
+  if BridgeEnabled then Map.CreateLinks;
+
+  if SymetricMap then begin
+    Map.MakeSymetric;
+    if BridgeEnabled then Map.CreateLinks;
+  end;
 
   Players.Assign(PlayersSetting);