Merge pull request #19 from Secre-C/main

allow new flow functions to be added to library overrides
Sewer56 · Apr 30, 2024 · 72a4131 · 72a4131
2 parents 35760ae + 1e52c9f
commit 72a4131
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/Emulator/BF.File.Emulator/Bf/BfBuilder.cs b/Emulator/BF.File.Emulator/Bf/BfBuilder.cs
@@ -160,11 +160,27 @@ private Library OverrideLibraries(Library library)
         // Override existing functions
         foreach (var func in _libraryFuncs)
         {
+            int module = -1;
+            int index = -1;
+
             for (int i = 0; i < library.FlowScriptModules.Count; i++)
             {
-                var existing = library.FlowScriptModules[i].Functions.FindIndex(x => x.Index == func.Index);
-                if (existing != -1)
-                    library.FlowScriptModules[i].Functions[existing] = func;
+                index = library.FlowScriptModules[i].Functions.FindIndex(x => x.Index == func.Index);
+
+                if (index != -1)
+                {
+                    module = i;
+                    break;
+                }
+            }
+
+            if (module != -1 && index != -1)
+            {
+                library.FlowScriptModules[module].Functions[index] = func;
+            }
+            else
+            {
+                library.FlowScriptModules.Last().Functions.Add(func);
             }
         }