Changeset 258 for trunk/UMap.pas

Timestamp:

Sep 23, 2018, 1:43:52 PM (6 years ago)

Author:

chronos

Message:

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

File:

• trunk/UMap.pas (modified) (4 diffs)

trunk/UMap.pas

@@ -467 +467 @@
 end;
 
-{procedure TMap.Paint(Canvas: TCanvas; View: TView);
-var
-  I: Integer;
-  Cell: TCell;
-  PosFrom, PosTo: TPoint;
-  Angle: Double;
-  ArrowCenter: TPoint;
-  Move: TUnitMove;
-  CellLink: TCellLink;
-begin
-  with Canvas, View do
-  try
-    Lock;
-
-    // Draw cell links
-    Pen.Color := clBlack;
-    Pen.Style := psSolid;
-    Pen.Width := 3;
-    for CellLink in CellLinks do
-    with CellLink do begin
-      if Length(Points) >= 2 then begin
-        MoveTo(PointToStdPoint(View.CellToCanvasPos(Points[0])));
-        for I := 1 to Length(Points) - 1 do
-          LineTo(PointToStdPoint(View.CellToCanvasPos(Points[I])));
-      end;
-    end;
-
-    // Draw cells
-    for Cell in Cells do begin
-      if (Cell.Terrain <> ttVoid) and Cell.IsVisible(View) then begin
-        if Assigned(SelectedCell) and (SelectedCell.MapCell = Cell) then
-          Brush.Color := clGreen
-          else if Assigned(SelectedCell) and IsCellsNeighbor(SelectedCell.MapCell, Cell) then
-            Brush.Color := clPurple
-          else Brush.Color := Cell.GetColor;
-        //Pen.Color := clBlack;
-        PaintCell(Canvas, Cell.PosPx, IntToStr(Cell.Power), View, Cell);
-      end;
-    end;
-  finally
-    Unlock;
-  end;
-end;
-}
-
 function TMap.GetNewCellId: Integer;
 begin
@@ -647 +602 @@
   Result := Cell.PosPx;
 end;
-
-{procedure TMap.PaintCell(Canvas: TCanvas; Pos: TPoint; Text: string; View: TView;
-  Cell: TCell);
-var
-  I: Integer;
-  TextPos: TPoint;
-  Points: array of Classes.TPoint;
-  TextSize: TSize;
-begin
-  if Cell.Extra = etObjectiveTarget then begin
-    Text := Text + '!';
-  end;
-  with Canvas do begin
-    if Assigned(View.FocusedCell) and (View.FocusedCell.MapCell = Cell) then begin
-      Pen.Color := clYellow;
-      Pen.Style := psSolid;
-      Pen.Width := 1;
-    end else
-    if Cell.Terrain = ttCity then begin
-      // Cannot set clear border as it will display shifted on gtk2
-      //Pen.Style := psClear;
-      Pen.Color := clBlack;
-      Pen.Style := psSolid;
-      Pen.Width := 3;
-    end else begin
-      // Cannot set clear border as it will display shifted on gtk2
-      //Pen.Style := psClear;
-      Pen.Color := Brush.Color;
-      Pen.Style := psSolid;
-      Pen.Width := 0;
-    end;
-    // Transform view
-    SetLength(Points, Length(Cell.Polygon.Points));
-    for I := 0 to Length(Points) - 1 do
-      Points[I] := PointToStdPoint(View.CellToCanvasPos(Cell.Polygon.Points[I]));
-    Brush.Style := bsSolid;
-    //Polygon(Points, False, 0, Length(Points));
-    TCanvasEx.PolygonEx(Canvas, Points, False);
-    //MoveTo(Points[0].X, Points[0].Y);
-    //LineTo(Points[1].X, Points[1].Y);
-
-    // Show cell text
-    if (Cell.Power <> 0) or (Cell.Extra = etObjectiveTarget) then begin
-      Pen.Style := psSolid;
-      Font.Color := clWhite;
-      Brush.Style := bsClear;
-      Font.Size := Trunc(42 * View.Zoom);
-      TextPos := View.CellToCanvasPos(Pos);
-      TextSize := TextExtent(Text);
-      TCanvasEx.TextOutEx(Canvas, Round(TextPos.X) - TextSize.cx div 2,
-        Round(TextPos.Y) - TextSize.cy div 2, Text, False);
-    end;
-  end;
-end;
-}
 
 procedure TMap.ComputePlayerStats;
@@ -1010 +910 @@
 procedure TCell.ConnectTo(Cell: TCell);
 begin
+  if Cell = Self then
+    raise Exception.Create('Can''t connect map cell to itself');
   // Connect only if already not connected
   if Neighbors.IndexOf(Cell) < 0 then begin
@@ -1068 +970 @@
 var
   I: Integer;
+  Cell: TCell;
 begin
   Player := TGame(Map.Game).Players.FindById(PlayerId);
 
   Neighbors.Count := Length(NeighborsId);
+  for I := 0 to Length(NeighborsId) - 1 do
+    Neighbors[I] := nil;
   for I := 0 to Length(NeighborsId) - 1 do begin
-    Neighbors[I] := Map.Cells.FindById(NeighborsId[I]);
+    Cell := Map.Cells.FindById(NeighborsId[I]);
+    if not Assigned(Cell) then
+      raise Exception.Create('Neighbor cell id not found ' + IntToStr(NeighborsId[I]));
+    if Neighbors.IndexOf(Cell) <> -1 then
+      raise Exception.Create('Duplicate neighbor cell ' + IntToStr(NeighborsId[I]) + ' found for cell ' + IntToStr(Id));
+    Neighbors[I] := Cell;
   end;
 end;