Changeset 661

Timestamp:

Jul 4, 2025, 9:36:29 PM (3 weeks ago)

Author:

chronos

Message:

• Modified: Tribes PictureList changed to generic object list.

File:

• trunk/LocalPlayer/Tribes.pas (modified) (7 diffs)

trunk/LocalPlayer/Tribes.pas

@@ -6 +6 @@
 uses
   Protocol, ScreenTools, LazFileUtils, Classes, SysUtils, Global, GraphicSet,
+  Generics.Collections,
   {$IFDEF DPI}Dpi.Graphics{$ELSE}Graphics{$ENDIF};
 
@@ -84 +85 @@
 
 type
-  TChosenModelPictureInfo = record
+  TChosenModelPictureInfo = class
     Hash: Integer;
     HGr: TGraphicSet;
     pix: Integer;
-    ModelName: ShortString;
-  end;
-
-  TPictureList = array [0 .. 99999] of TChosenModelPictureInfo;
+    ModelName: string;
+  end;
 
 var
   StdUnitScript: TStringList;
-  PictureList: ^TPictureList;
-  nPictureList: Integer;
+  PictureList: TObjectList<TChosenModelPictureInfo>;
 
 procedure Init;
@@ -103 +101 @@
   StdUnitScript.LoadFromFile(LocalizedFilePath('Tribes' +
     DirectorySeparator + 'StdUnits.txt'));
-  nPictureList := 0;
-  PictureList := nil;
+  PictureList := TObjectList<TChosenModelPictureInfo>.Create;
 end;
 
 procedure Done;
 begin
-  ReallocMem(PictureList, 0);
+  FreeAndNil(PictureList);
   FreeAndNil(StdUnitScript);
 end;
@@ -486 +483 @@
   I: Integer;
   Ok: Boolean;
+  NewPictureInfo: TChosenModelPictureInfo;
 begin
   with Info do
@@ -491 +489 @@
     if not IsNew then
     begin
-      I := nPictureList - 1;
+      I := PictureList.Count - 1;
       while (I >= 0) and (PictureList[I].Hash <> Info.Hash) do
         Dec(I);
@@ -540 +538 @@
       end;
 
-      if Hash <> 0 then
-      begin
-        if nPictureList = 0 then
-          ReallocMem(PictureList, 64 * SizeOf(TChosenModelPictureInfo))
-        else if (nPictureList >= 64) and (nPictureList and
-          (nPictureList - 1) = 0) then
-          ReallocMem(PictureList,
-            nPictureList * (2 * SizeOf(TChosenModelPictureInfo)));
-        PictureList[nPictureList].Hash := Info.Hash;
-        PictureList[nPictureList].HGr := ModelPicture[mix].HGr;
-        PictureList[nPictureList].pix := Info.pix;
-        PictureList[nPictureList].ModelName := ModelName[mix];
-        Inc(nPictureList);
+      if Hash <> 0 then begin
+        NewPictureInfo := TChosenModelPictureInfo.Create;
+        NewPictureInfo.Hash := Info.Hash;
+        NewPictureInfo.HGr := ModelPicture[mix].HGr;
+        NewPictureInfo.pix := Info.pix;
+        NewPictureInfo.ModelName := ModelName[mix];
+        PictureList.Add(NewPictureInfo);
       end;
     end;
@@ -604 +596 @@
   if not ForceNew and (Picture.Hash > 0) then
   begin
-    for I := 0 to nPictureList - 1 do
+    for I := 0 to PictureList.Count - 1 do
       if PictureList[I].Hash = Picture.Hash then
       begin