Changeset 376

Timestamp:

Jan 3, 2025, 5:04:19 PM (5 days ago)

Author:

chronos

Message:

• Fixed: Symetric map generation.

Location:

trunk

Files:

• Map.pas (modified) (2 diffs)
• Units.pas (modified) (1 diff)

trunk/Map.pas

@@ -682 +682 @@
   OtherCell1: TCell;
   OtherCell2: TCell;
+  Cell: TCell;
   OppositeCell: TCell;
 begin
   // Generic way to create two sides symetric map independent to shape
+  // Set first half as inverted second half
   for C := 0 to (Cells.Count div 2) - 1 do begin
-    Cells[C].Terrain := Cells[Cells.Count - 1 - C].Terrain;
+    Cell := Cells[C];
+    OppositeCell := Cells[Cells.Count - 1 - C];
+
+    Cell.Terrain := OppositeCell.Terrain;
 
     // Sync units
-    if not Assigned(Cells[C].OneUnit) and Assigned(Cells[Cells.Count - 1 - C].OneUnit) then begin
-      Cells[C].OneUnit := TGame(Game).Units.AddNew(Cells[Cells.Count - 1 - C].OneUnit.Kind,
-        Cells[Cells.Count - 1 - C].OneUnit.Power);
-    end;
-    if Assigned(Cells[C].OneUnit) and Assigned(Cells[Cells.Count - 1 - C].OneUnit) then
-      Cells[C].OneUnit.Power := Cells[Cells.Count - 1 - C].OneUnit.Power;
-
-    if Assigned(Cells[C].OneUnit) and not Assigned(Cells[Cells.Count - 1 - C].OneUnit) then begin
-      TGame(Game).Units.Remove(Cells[C].OneUnit);
-    end;
-
-    for I := Cells[C].Links.Count - 1 downto 0 do begin
-      CellLink := Cells[C].Links[I];
+    if not Assigned(Cell.OneUnit) and Assigned(OppositeCell.OneUnit) then begin
+      Cell.OneUnit := TGame(Game).Units.AddNew(OppositeCell.OneUnit.Kind,
+        OppositeCell.OneUnit.Power);
+    end;
+    if Assigned(Cell.OneUnit) and Assigned(OppositeCell.OneUnit) then begin
+      Cell.OneUnit.Kind := OppositeCell.OneUnit.Kind;
+      Cell.OneUnit.Power := OppositeCell.OneUnit.Power;
+    end;
+
+    if Assigned(Cell.OneUnit) and not Assigned(OppositeCell.OneUnit) then begin
+      TGame(Game).Units.Remove(Cell.OneUnit);
+    end;
+
+    for I := Cell.Links.Count - 1 downto 0 do begin
+      CellLink := Cell.Links[I];
 
       // Remove cells on first half of the map
@@ -734 +741 @@
     // Make copy of links from second half
     OppositeCell := Cells[Cells.Count - 1 - C];
+
     for CellLink in OppositeCell.Links do
       if (Cells.IndexOf(CellLink.Cells[0]) > (Cells.Count div 2)) and

trunk/Units.pas

@@ -237 +237 @@
 destructor TUnit.Destroy;
 begin
+  MapCell := nil;
   Player := nil;
   inherited;