From e5222f95f6640f9fb89c9a73ffd9a42e133ac3f1 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 24 May 2017 22:18:52 +0100 Subject: [PATCH] Remove ambiguity from FileSystem references. --- OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs | 3 ++- .../Widgets/Logic/Installation/ModContentLogic.cs | 3 ++- .../Widgets/Logic/Installation/ModContentPromptLogic.cs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs b/OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs index 1602ff10d7..d06eb78cd3 100644 --- a/OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs +++ b/OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs @@ -12,6 +12,7 @@ using System; using System.Collections.Generic; using System.Linq; +using OpenRA.FileSystem; using OpenRA.Traits; namespace OpenRA.Mods.Common.UtilityCommands @@ -82,7 +83,7 @@ namespace OpenRA.Mods.Common.UtilityCommands .Select(m => new Map(modData, m.Package))); } else - maps.Add(new Map(modData, new FileSystem.Folder(".").OpenPackage(args[1], modData.ModFiles))); + maps.Add(new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles))); foreach (var testMap in maps) { diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentLogic.cs index f4b3a39c66..8d0d4449ed 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentLogic.cs @@ -14,6 +14,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.FileSystem; using OpenRA.Widgets; +using FS = OpenRA.FileSystem.FileSystem; namespace OpenRA.Mods.Common.Widgets.Logic { @@ -37,7 +38,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic var modObjectCreator = new ObjectCreator(mod, Game.Mods); var modPackageLoaders = modObjectCreator.GetLoaders(mod.PackageFormats, "package"); - var modFileSystem = new FileSystem.FileSystem(Game.Mods, modPackageLoaders); + var modFileSystem = new FS(Game.Mods, modPackageLoaders); modFileSystem.LoadFromManifest(mod); var sourceYaml = MiniYaml.Load(modFileSystem, content.Sources, null); diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentPromptLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentPromptLogic.cs index e6b51cc74d..38babe3c5c 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentPromptLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentPromptLogic.cs @@ -13,6 +13,7 @@ using System; using System.Linq; using OpenRA.FileSystem; using OpenRA.Widgets; +using FS = OpenRA.FileSystem.FileSystem; namespace OpenRA.Mods.Common.Widgets.Logic { @@ -58,7 +59,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic { var modObjectCreator = new ObjectCreator(mod, Game.Mods); var modPackageLoaders = modObjectCreator.GetLoaders(mod.PackageFormats, "package"); - var modFileSystem = new FileSystem.FileSystem(Game.Mods, modPackageLoaders); + var modFileSystem = new FS(Game.Mods, modPackageLoaders); modFileSystem.LoadFromManifest(mod); var downloadYaml = MiniYaml.Load(modFileSystem, content.Downloads, null);