Changeset 259 for tags/1.3.0

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)
• Languages/xtactics.cs.po (modified) (6 diffs)
• Languages/xtactics.po (modified) (5 diffs)
• UGeometry.pas (modified) (2 diffs)
• UMap.pas (modified) (4 diffs)
• UMapType.pas (modified) (1 diff)
• UPlayer.pas (modified) (3 diffs)

tags/1.3.0/Languages/xtactics.cs.po

@@ -230 +230 @@
 msgstr "Vykonat"
 
-#: tformmain.astatusbarvisible.caption
-msgid "Status bar visible"
-msgstr "Viditelná stavová lišta"
-
 #: tformmain.atoolbarbigicons.caption
 msgctxt "tformmain.atoolbarbigicons.caption"
@@ -278 +274 @@
 msgid "Help"
 msgstr "Nápověda"
+
+#: tformmain.menuitem22.caption
+msgctxt "tformmain.menuitem22.caption"
+msgid "Statusbar visible"
+msgstr "Viditelná stavová lišta"
 
 #: tformmain.menuitem8.caption
@@ -354 +355 @@
 #: tformnew.aplayermodify.caption
 msgctxt "tformnew.aplayermodify.caption"
-msgid "Modify"
+msgid "Modify player"
 msgstr "Upravit"
 
@@ -378 +379 @@
 msgstr "Odstranit"
 
+#: tformnew.button1.caption
+msgctxt "tformnew.button1.caption"
+msgid "Add"
+msgstr "Přidat"
+
+#: tformnew.button2.caption
+msgctxt "tformnew.button2.caption"
+msgid "Remove"
+msgstr "Odstranit"
+
+#: tformnew.button3.caption
+msgctxt "tformnew.button3.caption"
+msgid "Modify"
+msgstr "Upravit"
+
 #: tformnew.buttoncancel.caption
 msgctxt "tformnew.buttoncancel.caption"
@@ -392 +408 @@
 msgid "Ok"
 msgstr "Ok"
+
+#: tformnew.buttonplayeradd.caption
+msgctxt "tformnew.buttonplayeradd.caption"
+msgid "Add"
+msgstr "Přidat"
+
+#: tformnew.buttonplayermodify.caption
+msgctxt "tformnew.buttonplayermodify.caption"
+msgid "Modify"
+msgstr "Upravit"
+
+#: tformnew.buttonplayerremove.caption
+msgctxt "tformnew.buttonplayerremove.caption"
+msgid "Remove"
+msgstr "Odstranit"
 
 #: tformnew.caption
@@ -1059 +1090 @@
 msgid "64-bit UInt read overflow."
 msgstr "Přetečení při čtení 64-bit UInt"
-

tags/1.3.0/Languages/xtactics.po

@@ -220 +220 @@
 msgstr ""
 
-#: tformmain.astatusbarvisible.caption
-msgid "Status bar visible"
-msgstr ""
-
 #: tformmain.atoolbarbigicons.caption
 msgctxt "tformmain.atoolbarbigicons.caption"
@@ -269 +265 @@
 msgstr ""
 
+#: tformmain.menuitem22.caption
+msgctxt "tformmain.menuitem22.caption"
+msgid "Statusbar visible"
+msgstr ""
+
 #: tformmain.menuitem8.caption
 msgctxt "tformmain.menuitem8.caption"
@@ -342 +343 @@
 #: tformnew.aplayermodify.caption
 msgctxt "tformnew.aplayermodify.caption"
-msgid "Modify"
+msgid "Modify player"
 msgstr ""
 
@@ -365 +366 @@
 msgstr ""
 
+#: tformnew.button1.caption
+msgctxt "tformnew.button1.caption"
+msgid "Add"
+msgstr ""
+
+#: tformnew.button2.caption
+msgctxt "tformnew.button2.caption"
+msgid "Remove"
+msgstr ""
+
+#: tformnew.button3.caption
+msgctxt "tformnew.button3.caption"
+msgid "Modify"
+msgstr ""
+
 #: tformnew.buttoncancel.caption
 msgctxt "TFORMNEW.BUTTONCANCEL.CAPTION"
@@ -378 +394 @@
 msgctxt "TFORMNEW.BUTTONOK.CAPTION"
 msgid "Ok"
+msgstr ""
+
+#: tformnew.buttonplayeradd.caption
+msgctxt "tformnew.buttonplayeradd.caption"
+msgid "Add"
+msgstr ""
+
+#: tformnew.buttonplayermodify.caption
+msgctxt "tformnew.buttonplayermodify.caption"
+msgid "Modify"
+msgstr ""
+
+#: tformnew.buttonplayerremove.caption
+msgctxt "tformnew.buttonplayerremove.caption"
+msgid "Remove"
 msgstr ""
 

tags/1.3.0/UGeometry.pas

@@ -123 +123 @@
 
 function TypedMod(Numerator, Denominator: Integer): Integer; overload;
-function TypedMod(Numerator, Denominator: Single): Single; overload;
+//function TypedMod(Numerator, Denominator: Single): Single; overload;
 function TypedDivide(Divident, Divisor: Integer): Integer; overload;
 function TypedDivide(Divident, Divisor: Single): Single; overload;
@@ -146 +146 @@
 end;
 
-function TypedMod(Numerator, Denominator: Single): Single; overload;
+{function TypedMod(Numerator, Denominator: Single): Single; overload;
 begin
   //Result := FMod(Numerator, Denominator);
-end;
+end;}
 
 function TypedDivide(Divident, Divisor: Integer): Integer;

tags/1.3.0/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;

tags/1.3.0/UMapType.pas

@@ -489 +489 @@
       for Y := -1 to 1 do
       for X := -1 to 1 do
-      for J := 0 to Cells.Count - 1 do begin
+      for J := 0 to Cells.Count - 1 do
+      if J <> I then begin
         P := Cells[J].Polygon;
         P.Move(TPoint.Create(X * AreaSize.X, Y * AreaSize.Y));

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;