Changeset 259 for tags/1.3.0/UPlayer.pas

Timestamp:

Sep 23, 2018, 1:46:15 PM (6 years ago)

Author:

chronos

Message:

Merged revision(s) 258 from trunk:

• Fixed: Bad cell links in Voronoi map type causing problems on openning saved file.
• Added: More checks for loaded game file.

Location:

tags/1.3.0

Files:

• . (modified) (1 prop)
• UPlayer.pas (modified) (3 diffs)

tags/1.3.0/UPlayer.pas

@@ -217 +217 @@
 
 procedure TPlayerCell.LoadFromNode(Node: TDOMNode);
+var
+  C: TCell;
+  CellId: Integer;
 begin
   Explored := ReadBoolean(Node, 'Explored', False);
-  MapCell := TGame(List.Map.Player.Game).Map.Cells.FindById(ReadInteger(Node, 'MapCell', 0));
+  CellId := ReadInteger(Node, 'MapCell', 0);
+  C := TGame(List.Map.Player.Game).Map.Cells.FindById(CellId);
+  if not Assigned(C) then
+    raise Exception.Create('Cell map not found ' + IntToStr(CellId));
+  if List.SearchCell(C) <> nil then
+    raise Exception.Create('Map cell used twice ' + IntToStr(CellId));
+  MapCell := C;
 end;
 
 procedure TPlayerCell.ConnectTo(Cell: TPlayerCell);
 begin
+  if Cell = Self then
+    raise Exception.Create('Can''t connect player cell to itself');
   if (Cell.Neighbors.IndexOf(Self) = -1) and
-  (Neighbors.IndexOf(Cell) = -1) then begin;
+  (Neighbors.IndexOf(Cell) = -1) then begin
     Cell.Neighbors.Add(Self);
     Neighbors.Add(Cell);
@@ -282 +293 @@
 begin
   for I := MovesFrom.Count - 1 downto 0 do
-    TUnitMove(MovesFrom[I]).List.Remove(TUnitMove(MovesFrom[I]));
+    if TUnitMove(MovesFrom[I]).List.Remove(TUnitMove(MovesFrom[I])) = -1 then
+      raise Exception.Create('MoveFrom cell remove error');
   FreeAndNil(MovesFrom);
   for I := MovesTo.Count - 1 downto 0 do
-    TUnitMove(MovesTo[I]).List.Remove(TUnitMove(MovesTo[I]));
+    if TUnitMove(MovesTo[I]).List.Remove(TUnitMove(MovesTo[I])) = -1 then
+      raise Exception.Create('MoveTo cell remove error');
   FreeAndNil(MovesTo);
   for I := Neighbors.Count - 1 downto 0 do
@@ -672 +685 @@
   if FCellFrom = AValue then Exit;
   if Assigned(AValue) and not Assigned(FCellFrom) then begin
-    AValue.MovesFrom.Add(Self);
+    if AValue.MovesFrom.IndexOf(Self) = -1 then
+      AValue.MovesFrom.Add(Self)
+      else raise Exception.Create('Unit move already exists');
   end else
   if not Assigned(AValue) and Assigned(FCellFrom) then begin
-    FCellFrom.MovesFrom.Remove(Self);
+    if FCellFrom.MovesFrom.IndexOf(Self) <> -1 then
+      FCellFrom.MovesFrom.Remove(Self)
+      else raise Exception.Create('Unit move not found');
   end;
   FCellFrom := AValue;