Changeset 334 for trunk

Timestamp:

Aug 27, 2024, 4:39:09 PM (3 months ago)

Author:

chronos

Message:

• Fixed: Recalculate list NewId if necessary.

Location:

trunk

Files:

• ClientGUI.pas (modified) (1 diff)
• ItemList.pas (modified) (5 diffs)

trunk/ClientGUI.pas

@@ -365 +365 @@
             end;
           if Assigned(SelectedCell) and (SelectedCell = Cell) then
-              Brush.Color := clGreen
+            Brush.Color := clGreen
             else if Assigned(SelectedCell) and ControlPlayer.IsAllowedMoveTarget(SelectedCell, Cell) then
               Brush.Color := clPurple

trunk/ItemList.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Generics.Collections, DOM, XML, Common, Graphics;
+  Classes, SysUtils, Generics.Collections, DOM, XML, Common, Graphics, Math;
 
 type
@@ -77 +77 @@
 
   TItemList = class(TObjectList<TItem>)
+  private
+    procedure RecalculateNewId(Reset: Boolean);
+  public
     NewId: Integer;
     class function GetItemClass: TItemClass; virtual;
@@ -144 +147 @@
   for I := 0 to Count - 1 do
     TItem(Items[I]).Assign(Source.Items[I]);
+  RecalculateNewId(True);
 end;
 
@@ -172 +176 @@
     Node2 := Node2.NextSibling;
   end;
+  RecalculateNewId(True);
 end;
 
@@ -191 +196 @@
   inherited;
   NewId := 1;
+end;
+
+procedure TItemList.RecalculateNewId(Reset: Boolean);
+var
+  I: Integer;
+begin
+  NewId := 1;
+  for I := 0 to Count - 1 do
+  with TItem(Items[I]) do begin
+    NewId := Max(NewId, Id + 1);
+  end;
 end;