Changeset 149 for trunk/UGame.pas

Timestamp:

Nov 13, 2017, 12:17:04 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Problems with freeing TUnitMove either from owner list by Delete/Remove of by TUnitMove.Free/Destroy. Unified to use only Delete/Remove.

File:

• trunk/UGame.pas (modified) (8 diffs)

trunk/UGame.pas

@@ -1636 +1636 @@
 
 destructor TUnitMove.Destroy;
-var
-  LastState: Boolean;
 begin
   CellFrom := nil;
   CellTo := nil;
-  if Assigned(List) then begin
-    // To remove itself from list we need disable owning to not be called twice
-    try
-      LastState := List.FreeObjects;
-      List.FreeObjects := False;
-      List.Remove(Self);
-    finally
-      List.FreeObjects := LastState;
-    end;
-  end;
+  List := nil;
   inherited Destroy;
 end;
@@ -1887 +1876 @@
 begin
   for I := MovesFrom.Count - 1 downto 0 do
-    TUnitMove(MovesFrom[I]).Free;
+    TUnitMove(MovesFrom[I]).List.Remove(TUnitMove(MovesFrom[I]));
   FreeAndNil(MovesFrom);
   for I := MovesTo.Count - 1 downto 0 do
-    TUnitMove(MovesTo[I]).Free;
+    TUnitMove(MovesTo[I]).List.Remove(TUnitMove(MovesTo[I]));
   FreeAndNil(MovesTo);
   for I := Links.Count - 1 downto 0 do
@@ -2307 +2296 @@
       // Fallback
       for I := MovesTo.Count - 1 downto 0 do
-        TUnitMove(MovesTo[I]).Free;
+        Player.Moves.Remove(MovesTo[I]);
       for I := 0 to Neighbors.Count - 1 do
       if (TCell(Neighbors[I]).Player = Player) and (AttackersCount(TCell(Neighbors[I])) = 0) then begin
@@ -2342 +2331 @@
       if ssShift in ShiftState then begin
         // Make maximum unit move without confirmation dialog
-        for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
-          TUnitMove(SelectedCell.MovesFrom[I]).Free;
+        for I := SelectedCell.MovesFrom.Count - 1 downto 0 do begin
+          Player.Moves.Remove(SelectedCell.MovesFrom[I]);
+        end;
         Game.CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power, False);
         SelectedCell := nil;
@@ -2351 +2341 @@
         // move all power to new selected cell
         for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
-          TUnitMove(SelectedCell.MovesFrom[I]).Free;
+          Player.Moves.Remove(SelectedCell.MovesFrom[I]);
         UnitMove := Game.CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.Power, False);
         if Assigned(UnitMove) then
@@ -2620 +2610 @@
 var
   NewMove: TUnitMove;
-  I: Integer;
   CountOnce: Integer;
   CountRepeat: Integer;
   Confirm: Boolean;
 begin
-  I := 0;
   Confirm := True;
   Result := Moves.SearchByFromTo(CellFrom, CellTo);
@@ -2643 +2631 @@
     if Assigned(Result) then begin
       // Already have such move
-      if (CountOnce = 0) and (CountRepeat = 0) then Moves.Delete(I)
-        else begin
+      if (CountOnce = 0) and (CountRepeat = 0) then begin
+          Result.List.Remove(Result);
+        end else begin
           Result.CountOnce := CountOnce;
           Result.CountRepeat := CountRepeat;
@@ -2903 +2892 @@
 
     List := TCells.Create;
-    List.FreeObjects := False;
-    Map.Cells.GetCellsWithWeight(List, Round(LongestDistance * 0.6), Round(LongestDistance * 0.8));
-    StartCell := List[Random(List.Count)];
-    FreeAndNil(List);
+    try
+      List.FreeObjects := False;
+      Map.Cells.GetCellsWithWeight(List, Round(LongestDistance * 0.6), Round(LongestDistance * 0.8));
+      StartCell := List[Random(List.Count)];
+    finally
+      FreeAndNil(List);
+    end;
   end;
 end;