Fix AltTitlesList was broken in several ways

Notably, scans didn't add to it anymore
FenPhoenix · Apr 23, 2024 · 7dfe7aa · 7dfe7aa
1 parent 890c6f8
commit 7dfe7aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 36 deletions.
diff --git a/AngelLoader/Common/DataClasses/FMDataSupporting.cs b/AngelLoader/Common/DataClasses/FMDataSupporting.cs
@@ -99,44 +99,22 @@ public void Add(string value)
         ++Count;
     }
 
-    public void ClearAndAdd_Single(string str)
+    public void ClearAndAddTitleAndAltTitles(string title, string[] altTitles)
     {
-        if (_values is null or string)
-        {
-            _values = str;
-        }
-        else
-        {
-            InitValuesToList();
-            Unsafe.As<List<string>>(_values).ClearAndAdd_Single(str);
-        }
-    }
+        _values = title;
+        Count = 1;
 
-    public void AddRange(string[] collection)
-    {
-        if (collection.Length == 1)
-        {
-            if (_values is null or string)
-            {
-                _values = collection[0];
-            }
-            else
-            {
-                List<string> list = Unsafe.As<List<string>>(_values);
-                list.Add(collection[0]);
-            }
-        }
-        else if (collection.Length > 1)
+        if (altTitles.Length == 0) return;
+
+        string? prevSingle = _values as string;
+        InitValuesToList();
+        List<string> list = Unsafe.As<List<string>>(_values);
+        if (prevSingle != null)
         {
-            string? prevSingle = _values as string;
-            InitValuesToList();
-            List<string> list = Unsafe.As<List<string>>(_values);
-            if (prevSingle != null)
-            {
-                list.Add(prevSingle);
-            }
-            list.AddRange_Small(collection);
+            list.Add(prevSingle);
         }
+        list.AddRange_Small(altTitles);
+        Count += altTitles.Length;
     }
 
     public void Clear()
@@ -149,6 +127,7 @@ public void Clear()
         {
             Unsafe.As<List<string>>(_values).Clear();
         }
+        Count = 0;
     }
 
     public string this[int index]

diff --git a/AngelLoader/FMScan.cs b/AngelLoader/FMScan.cs
@@ -337,8 +337,7 @@ static void ShowProgressBox(bool suppressShow)
 
                             if (gameSup)
                             {
-                                sel.AltTitles.ClearAndAdd_Single(sel.Title);
-                                sel.AltTitles.AddRange(scannedFM.AlternateTitles);
+                                sel.AltTitles.ClearAndAddTitleAndAltTitles(sel.Title, scannedFM.AlternateTitles);
                             }
                             else
                             {