Make usages of Computer.postAllLoadedActions use event subscription

Arkhist · Sep 11, 2021 · dbc2d66 · dbc2d66
1 parent b08c3ad
commit dbc2d66
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/PathfinderAPI/BaseGameFixes/MissionListingServerLoadTime.cs b/PathfinderAPI/BaseGameFixes/MissionListingServerLoadTime.cs
@@ -43,24 +43,23 @@ internal static void FixMissionLoadTimes(ILContext il)
             c.Emit(OpCodes.Ldloc_1);
             c.EmitDelegate<Action<MissionListingServer, bool>>((listingDaemon, shouldGen) =>
             {
-                ComputerLoader.postAllLoadedActions = (System.Action)Delegate.Combine(ComputerLoader.postAllLoadedActions, (System.Action)(
-                    () =>
+                ComputerLoader.postAllLoadedActions += () =>
+                {
+                    foreach (var file in Directory.GetFiles(listingDaemon.CustomFolderLoadPath, "*.xml"))
                     {
-                        foreach (var file in Directory.GetFiles(listingDaemon.CustomFolderLoadPath, "*.xml"))
-                        {
-                            OS.currentInstance.branchMissions = new List<ActiveMission>();
-                            listingDaemon.addMisison(MissionLoader.LoadContentMission(file));
-                        }
+                        OS.currentInstance.branchMissions = new List<ActiveMission>();
+                        listingDaemon.addMisison(MissionLoader.LoadContentMission(file));
+                    }
 
-                        if (shouldGen)
+                    if (shouldGen)
+                    {
+                        for (int i = 0; i < 2; i++)
                         {
-                            for (int i = 0; i < 2; i++)
-                            {
-                                OS.currentInstance.branchMissions = new List<ActiveMission>();
-                                listingDaemon.addMisison((ActiveMission)MissionGenerator.generate(2));
-                            }
+                            OS.currentInstance.branchMissions = new List<ActiveMission>();
+                            listingDaemon.addMisison((ActiveMission)MissionGenerator.generate(2));
                         }
-                    }));
+                    }
+                };
             });
         }
     }

diff --git a/PathfinderAPI/Replacements/ContentLoader.cs b/PathfinderAPI/Replacements/ContentLoader.cs
@@ -234,15 +234,13 @@ static ContentLoader()
 
                 var sourceComp = comp;
                 var origOs = os;
-
-                ComputerLoader.postAllLoadedActions = (System.Action) Delegate.Combine(
-                    ComputerLoader.postAllLoadedActions,
-                    (System.Action)(() =>
-                    {
-                        var nearNode = Programs.getComputer(os, nearNodeId);
-                        if (nearNode != null)
-                            sourceComp.location = nearNode.location + Corporation.getNearbyNodeOffset(nearNode.location, position, total, origOs.netMap, extraDistance, force);
-                    }));
+                
+                ComputerLoader.postAllLoadedActions += () =>
+                {
+                    var nearNode = Programs.getComputer(os, nearNodeId);
+                    if (nearNode != null)
+                        sourceComp.location = nearNode.location + Corporation.getNearbyNodeOffset(nearNode.location, position, total, origOs.netMap, extraDistance, force);
+                };
             });
             executor.RegisterExecutor("Computer.proxy", (exec, info) =>
             {
@@ -295,14 +293,13 @@ static ContentLoader()
                 var linked = info.Attributes.GetString("target");
                 var source = comp;
                 var origOS = os;
-                ComputerLoader.postAllLoadedActions = (System.Action)Delegate.Combine(
-                    ComputerLoader.postAllLoadedActions,
-                    (System.Action) (() =>
-                        {
-                            var linkedNode = Programs.getComputer(os, linked);
-                            if (linkedNode != null)
-                                source.links.Add(origOS.netMap.nodes.IndexOf(linkedNode));
-                        }));
+                
+                ComputerLoader.postAllLoadedActions += () =>
+                {
+                    var linkedNode = Programs.getComputer(os, linked);
+                    if (linkedNode != null)
+                        source.links.Add(origOS.netMap.nodes.IndexOf(linkedNode));
+                };
             });
             executor.RegisterExecutor("Computer.trace", (exec, info) =>
             {