Changeset 345

Timestamp:

Dec 23, 2024, 11:25:36 AM (4 hours ago)

Author:

chronos

Message:

• Modified: Improved test cases.

Location:

trunk

Files:

• GameSystem.pas (modified) (1 diff)
• Geometry.pas (modified) (2 diffs)
• ItemList.pas (modified) (1 diff)
• Map.pas (modified) (5 diffs)

trunk/GameSystem.pas

@@ -143 +143 @@
     (UnitsSplitMerge = GameSystem.UnitsSplitMerge) and
     (EmptyCellsNeutral = GameSystem.EmptyCellsNeutral) and
-    (PreferedMapType = GameSystem.PreferedMapType); // and
-    //(UnitKinds.Assign(GameSystem.UnitKinds) and
-    //(BuildingKinds.Assign(GameSystem.BuildingKinds) and
-    //(Nations.Assign(GameSystem.Nations);
+    (PreferedMapType = GameSystem.PreferedMapType) and
+    UnitKinds.Compare(GameSystem.UnitKinds) and
+    BuildingKinds.Compare(GameSystem.BuildingKinds) and
+    Nations.Compare(GameSystem.Nations);
 end;
 

trunk/Geometry.pas

@@ -96 +96 @@
     constructor Create(const Points: TPointArray); overload;
     constructor Create(const Rect: TGRect<T>); overload;
+    function Compare(Polygon: TGPolygon<T>): Boolean;
     procedure Move(P: T);
     function GetRect: TGRect<T>;
@@ -239 +240 @@
   Self.Points[2] := Rect.P2;
   Self.Points[3] := T.Create(Rect.P1.X, Rect.P2.Y);
+end;
+
+function TGPolygon<T>.Compare(Polygon: TGPolygon<T>): Boolean;
+var
+  I: Integer;
+begin
+  Result := Length(Points) = Length(Polygon.Points);
+  if not Result then Exit;
+  for I := 0 to Length(Points) - 1 do
+    if Points[I] <> Polygon.Points[I] then begin
+      Result := False;
+      Break;
+    end;
 end;
 

trunk/ItemList.pas

@@ -253 +253 @@
 end;
 
-function TItemList<T>.QueryInterface(constref iid: tguid; out obj): longint;
+function TItemList<T>.QueryInterface(constref iid: tguid; out obj): LongInt;
   stdcall;
 begin
-end;
-
-function TItemList<T>._AddRef: Longint; stdcall;
-begin
-end;
-
-function TItemList<T>._Release: Longint; stdcall;
-begin
+  Result := 0;
+end;
+
+function TItemList<T>._AddRef: LongInt; stdcall;
+begin
+  Result := 0;
+end;
+
+function TItemList<T>._Release: LongInt; stdcall;
+begin
+  Result := 0;
 end;
 

trunk/Map.pas

@@ -48 +48 @@
     Extra: TExtraType;
     OneUnitId: Integer; // Temporary value
+    function Compare(Cell: TCell): Boolean;
     procedure ConnectTo(Cell: TCell);
     procedure DisconnectFrom(Cell: TCell);
@@ -80 +81 @@
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
+    function Compare(Cells: TCells): Boolean;
     procedure ClearMark;
     procedure ClearWeight;
@@ -409 +411 @@
 end;
 
+function TCells.Compare(Cells: TCells): Boolean;
+var
+  I: Integer;
+begin
+  Result := True;
+  for I := 0 to Count - 1 do
+  with Items[I] do begin
+    if not Items[I].Compare(Cells[I]) then begin
+      Result := False;
+      Break;
+    end;
+  end;
+end;
+
 procedure TCells.ClearMark;
 var
@@ -543 +559 @@
 function TMap.Compare(Map: TMap): Boolean;
 begin
-  Result := True;
+  Result := (MaxPower = Map.MaxPower) and
+    (Cyclic = Map.Cyclic) and
+    (Size = Map.Size) and
+    (DefaultCellSize = Map.DefaultCellSize) and
+    (Shape = Map.Shape) and
+    Cells.Compare(Map.Cells);
 end;
 
@@ -942 +963 @@
 end;
 
+function TCell.Compare(Cell: TCell): Boolean;
+begin
+  Result := (Id = Cell.Id) and
+    (PosPx = Cell.PosPx) and
+    (Terrain = Cell.Terrain) and
+    Polygon.Compare(Cell.Polygon) and
+    (Player = Cell.Player) and
+    (Mark = Cell.Mark) and
+    (Extra = Cell.Extra);
+end;
+
 procedure TCell.ConnectTo(Cell: TCell);
 begin