Changeset 222 for trunk/UGame.pas

Timestamp:

Jul 13, 2018, 11:13:12 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Computer was affecting player cells by its cell moves.
• Added: Additional consistency checks.

File:

• trunk/UGame.pas (modified) (9 diffs)

trunk/UGame.pas

@@ -38 +38 @@
   private
     FArea: TMapArea;
+    FId: Integer;
     FMap: TMap;
     FPower: Integer;
     procedure SetArea(AValue: TMapArea);
+    procedure SetId(AValue: Integer);
     procedure SetPower(AValue: Integer);
   public
-    Id: Integer;
     PosPx: TPoint;
     Polygon: TPolygon;
@@ -58 +59 @@
     Links: TCellLinks;
     Extra: TExtraType;
+    property Id: Integer read FId write SetId;
     procedure ConnectTo(Cell: TCell);
     procedure DisconnectFrom(Cell: TCell);
@@ -226 +228 @@
     procedure CreateLinks;
     procedure Clear;
+    procedure CheckCells;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -1688 +1691 @@
 end;
 
+procedure TMap.CheckCells;
+var
+  I: Integer;
+  J: Integer;
+begin
+  for I := 0 to Cells.Count - 1 do begin
+    for J := I + 1 to Cells.Count - 1 do begin
+      if (Cells[I].Id = Cells[J].Id) then
+        raise Exception.Create('Duplicate cells ID ' + IntToStr(I) + ' ' + IntToStr(J));
+      if (Cells[I].PosPx = Cells[J].PosPx) then
+        raise Exception.Create('Duplicate cells position ' + IntToStr(I) + ' ' + IntToStr(J));
+    end;
+  end;
+end;
+
 constructor TMap.Create;
 begin
@@ -1889 +1907 @@
   FArea := AValue;
   if Assigned(FArea) then FArea.Cells.Add(Self);
+end;
+
+procedure TCell.SetId(AValue: Integer);
+begin
+  if FId = AValue then Exit;
+  FId := AValue;
 end;
 
@@ -2037 +2061 @@
 constructor TCell.Create;
 begin
+  FId := -1;
   Player := nil;
   Neighbors := TCells.Create;
@@ -2451 +2476 @@
   Confirm: Boolean;
 begin
+  if CellFrom.Player <> Self then
+    raise Exception.Create('Can''t set move of other player.');
   Confirm := True;
   Result := Moves.SearchByFromTo(CellFrom, CellTo);
@@ -2749 +2776 @@
   I: Integer;
 begin
+  if AttackCount < 0 then raise Exception.Create('Attack power needs to be possitive' + IntToStr(AttackCount));
   if AttackCount = 0 then begin
     Result := 0;
     Exit;
   end;
+  if DefendCount < 0 then raise Exception.Create('Defend power needs to be possitive but is ' + IntToStr(DefendCount));
   if DefendCount = 0 then begin
     Result := 1;
@@ -3187 +3216 @@
   NewPlayerIndex: Integer;
 begin
+  {$IFDEF DEBUG}
+  Map.CheckCells;
+  {$ENDIF}
+
   // Finalize current player
   CurrentPlayer.MoveAll;