Changeset 343 for trunk

Timestamp:

Dec 22, 2024, 1:05:11 PM (7 hours ago)

Author:

chronos

Message:

• Modified: Improved tests.

Location:

trunk

Files:

• Map.pas (modified) (5 diffs)
• Tests.pas (modified) (1 diff)

trunk/Map.pas

@@ -177 +177 @@
     procedure Clear;
     procedure CheckCells;
+    function ToString: string; override;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -428 +429 @@
   Result := '';
   for C in Self do
-    Result := Result + IntToStr(C.Id) + ', ';
+    Result := Result + C.ToString + LineEnding;
 end;
 
@@ -759 +760 @@
 end;
 
+function TMap.ToString: string;
+begin
+  Result := 'MaxPower: ' + IntToStr(MaxPower) + LineEnding;
+  Result := Result + 'Cyclic: ' + BoolToStr(Cyclic) + LineEnding;
+  Result := Result + 'Size: ' + IntToStr(Size.X) + 'x' + IntToStr(Size.Y) + LineEnding;
+  Result := Result + 'DefaultCellSize: ' + IntToStr(DefaultCellSize.X) + 'x' + IntToStr(DefaultCellSize.Y) + LineEnding;
+  Result := Result + 'Shape: ' + IntToStr(Integer(Shape)) + LineEnding;
+  Result := Result + Cells.ToString + LineEnding;
+end;
+
 constructor TMap.Create;
 begin
@@ -1100 +1111 @@
   Player := Source.Player;
   Mark := Source.Mark;
+  Extra := Source.Extra;
   // TODO: How to copy neighbours and moves list
 end;
@@ -1111 +1123 @@
 function TCell.ToString: ansistring;
 begin
-  Result := IntToStr(Id);
+  Result := 'Id: ' + IntToStr(Id) + LineEnding;
+  Result := Result + 'PosPx: ' + IntToStr(PosPx.X) + 'x' + IntToStr(PosPx.Y) + LineEnding;
+  Result := Result + 'Terrain: ' + IntToStr(Integer(Terrain)) + LineEnding;
+  Result := Result + 'Extra: ' + IntToStr(Integer(Extra)) + LineEnding;
+  //Result := Result + 'Polygon: ' + IntToStr(Polygon) + LineEnding;
+  if Assigned(Player) then
+    Result := Result + 'Player: ' + IntToStr(TPlayer(Player).Id) + LineEnding;
+  Result := Result + 'Mark:' + BoolToStr(Mark) + LineEnding;
+  if Assigned(OneUnit) then
+    Result := Result + 'OneUnit:' + IntToStr(OneUnit.Id) + LineEnding;
 end;
 

trunk/Tests.pas

@@ -50 +50 @@
 const
   FileName = 'Test.xtg';
+  Size = 10;
 var
   Game2: TGame;
 begin
+  Game.Map.Size := TPoint.Create(Size, Size);
+  Game.MapType := mtSquare;
+  Game.New;
   Game.SaveToFile(FileName);
   Game2 := TGame.Create;