Changeset 407 for trunk/Packages/Common/ItemList.pas

Timestamp:

Jan 8, 2025, 10:18:12 AM (30 hours ago)

Author:

chronos

Message:

• Fixed: Cell cities were not correctly stored the saved game.
• Fixed: ItemList references were loaded by item index instead of item id.

File:

• trunk/Packages/Common/ItemList.pas (modified) (9 diffs)

trunk/Packages/Common/ItemList.pas

@@ -83 +83 @@
   public
   type
-    TAddEvent = function (constref AValue: TItem): SizeInt of object;
+    TAddEvent = function(constref AValue: TItem): SizeInt of object;
     TGetCountEvent = function: SizeInt of object;
     TSetItemEvent = procedure(Index: SizeInt; AValue: TItem) of object;
-    TGetNameEvent = procedure (out Name: string) of object;
+    TGetNameEvent = procedure(out Name: string) of object;
     TGetItemEvent = function(Index: SizeInt): TItem of object;
     TGetItemFieldsEvent = function: TItemFields of object;
     TRemoveEvent = function(constref AValue: TItem): SizeInt of object;
-    TGetNextAvailableNameEvent = procedure (Name: string; out NewName: string) of object;
+    TGetNextAvailableNameEvent = procedure(Name: string; out NewName: string) of object;
     TCreateItemEvent = function(Name: string = ''): TItem of object;
+    TFindByIdEvent = function(Id: Integer): TItem of object;
   private
     FOnAdd: TAddEvent;
     FOnCreateItem: TCreateItemEvent;
+    FOnFindById: TFindByIdEvent;
     FOnGetCount: TGetCountEvent;
     FOnGetItem: TGetItemEvent;
@@ -112 +114 @@
     function GetNextAvailableName(Name: string): string;
     function GetItemFields: TItemFields;
+    function FindById(Id: Integer): TItem;
     property Count: SizeInt read GetCount;
     property Items[Index: SizeInt]: TItem read GetItem write SetItem; default;
@@ -125 +128 @@
     property OnCreateItem: TCreateItemEvent read FOnCreateItem
       write FOnCreateItem;
+    property OnFindById: TFindByIdEvent read FOnFindById
+      write FOnFindById;
   end;
 
@@ -141 +146 @@
     function BaseGetItemFields: TItemFields;
     function BaseCreateItem(Name: string = ''): TItem;
+    function BaseFindById(Id: Integer): TItem;
     procedure BaseGetNextAvailableName(Name: string; out NewName: string);
   public
@@ -245 +251 @@
 end;
 
+function TItemList<T>.BaseFindById(Id: Integer): TItem;
+begin
+  Result := FindById(Id);
+end;
+
 procedure TItemList<T>.LoadFromNode(Node: TDOMNode);
 var
@@ -286 +297 @@
   FBaseItemList.OnGetNextAvailableName := BaseGetNextAvailableName;
   FBaseItemList.OnGetName := BaseGetName;
+  FBaseItemList.OnFindById := BaseFindById;
   NewId := 1;
 end;
@@ -483 +495 @@
   ReadId: Integer;
   ReferenceList: TBaseItemList;
+  RefItem: TItem;
 begin
   if Field.DataType = dtString then begin
@@ -503 +516 @@
     ReferenceList := GetReferenceList(Field.Index);
     if (ReadId > 0) and Assigned(ReferenceList) then
-      SetValueReference(Field.Index, TItem(ReferenceList[ReadId]));
+      RefItem := ReferenceList.FindById(ReadId);
+      if Assigned(RefItem) then
+        SetValueReference(Field.Index, RefItem)
+        else raise Exception.Create('Reference id ' + IntToStr(ReadId) + ' not found.');
   end else
     raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[Field.DataType]]));
@@ -817 +833 @@
 end;
 
+function TBaseItemList.FindById(Id: Integer): TItem;
+begin
+  if Assigned(FOnFindById) then Result := FOnFindById(Id)
+    else raise Exception.Create('Undefined FindById handler');
+end;
+
 end.