From 9580301a4f4ac740a6b8c4b854aa8d14638b785d Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Thu, 14 Nov 2019 23:47:31 -0600 Subject: [PATCH] Moved some trivial member instantiations to in-line No need to make every sub compiler create these --- Wabbajack.Lib/ACompiler.cs | 14 +++++++------- Wabbajack.Lib/Compiler.cs | 9 --------- Wabbajack.Lib/VortexCompiler.cs | 7 ------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/Wabbajack.Lib/ACompiler.cs b/Wabbajack.Lib/ACompiler.cs index 9c9c8561..279fe296 100644 --- a/Wabbajack.Lib/ACompiler.cs +++ b/Wabbajack.Lib/ACompiler.cs @@ -18,13 +18,13 @@ namespace Wabbajack.Lib public string ModListOutputFolder; public string ModListOutputFile; - public List SelectedArchives; - public List InstallDirectives; - public List AllFiles; - public ModList ModList; - public VirtualFileSystem VFS; - public List IndexedArchives; - public Dictionary> IndexedFiles; + public List SelectedArchives = new List(); + public List InstallDirectives = new List(); + public List AllFiles = new List(); + public ModList ModList = new ModList(); + public VirtualFileSystem VFS = VirtualFileSystem.VFS; + public List IndexedArchives = new List(); + public Dictionary> IndexedFiles = new Dictionary>(); public abstract void Info(string msg); public abstract void Status(string msg); diff --git a/Wabbajack.Lib/Compiler.cs b/Wabbajack.Lib/Compiler.cs index 3f395c63..1af2779e 100644 --- a/Wabbajack.Lib/Compiler.cs +++ b/Wabbajack.Lib/Compiler.cs @@ -50,15 +50,6 @@ namespace Wabbajack.Lib ModListOutputFolder = "output_folder"; ModListOutputFile = MO2Profile + ExtensionManager.Extension; - - SelectedArchives = new List(); - InstallDirectives = new List(); - AllFiles = new List(); - ModList = new ModList(); - - VFS = VirtualFileSystem.VFS; - IndexedArchives = new List(); - IndexedFiles = new Dictionary>(); } public dynamic MO2Ini { get; } diff --git a/Wabbajack.Lib/VortexCompiler.cs b/Wabbajack.Lib/VortexCompiler.cs index d650c3c2..80aa5789 100644 --- a/Wabbajack.Lib/VortexCompiler.cs +++ b/Wabbajack.Lib/VortexCompiler.cs @@ -55,13 +55,6 @@ namespace Wabbajack.Lib // TODO: add custom modlist name ModListOutputFile = $"VORTEX_TEST_MODLIST{ExtensionManager.Extension}"; - - VFS = VirtualFileSystem.VFS; - - SelectedArchives = new List(); - AllFiles = new List(); - IndexedArchives = new List(); - IndexedFiles = new Dictionary>(); } public override void Info(string msg)