Cleanup

Author: pzgulyas

Source/Orts.Simulation/Common/Scripting/ScriptManager.cs

@@ -33,25 +33,23 @@ namespace Orts.Common.Scripting
     [CallOnThread("Loader")]
     public class ScriptManager
     {
-        readonly Simulator Simulator;
         readonly IDictionary<string, Assembly> Scripts = new Dictionary<string, Assembly>();
         static readonly string[] ReferenceAssemblies = new[]
         {
-            typeof(System.Object).GetTypeInfo().Assembly.Location,
-            typeof(System.Diagnostics.Debug).GetTypeInfo().Assembly.Location,
-            typeof(ORTS.Common.ElapsedTime).GetTypeInfo().Assembly.Location,
-            typeof(ORTS.Scripting.Api.Timer).GetTypeInfo().Assembly.Location,
-            typeof(System.Linq.Enumerable).GetTypeInfo().Assembly.Location,
+            typeof(System.Object).Assembly.Location,
+            typeof(System.Diagnostics.Debug).Assembly.Location,
+            typeof(ORTS.Common.ElapsedTime).Assembly.Location,
+            typeof(ORTS.Scripting.Api.Timer).Assembly.Location,
+            typeof(System.Linq.Enumerable).Assembly.Location,
         };
         static MetadataReference[] References = ReferenceAssemblies.Select(r => MetadataReference.CreateFromFile(r)).ToArray();
         static CSharpCompilationOptions CompilationOptions = new CSharpCompilationOptions(
             OutputKind.DynamicallyLinkedLibrary,
             optimizationLevel: Debugger.IsAttached ? OptimizationLevel.Debug : OptimizationLevel.Release);
 
         [CallOnThread("Loader")]
-        internal ScriptManager(Simulator simulator)
+        internal ScriptManager()
         {
-            Simulator = simulator;
         }
 
         public object Load(string[] pathArray, string name, string nameSpace = "ORTS.Scripting.Script")

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -354,7 +354,7 @@ public Simulator(UserSettings settings, string activityPath, bool useOpenRailsDi
             Confirmer = new Confirmer(this, 1.5);
             HazzardManager = new HazzardManager(this);
             FuelManager = new FuelManager(this);
-            ScriptManager = new ScriptManager(this);
+            ScriptManager = new ScriptManager();
             Log = new CommandLog(this);
         }