diff --git a/OpenRA.Game/Platform.cs b/OpenRA.Game/Platform.cs index 319be36028..f5504ee4db 100644 --- a/OpenRA.Game/Platform.cs +++ b/OpenRA.Game/Platform.cs @@ -201,26 +201,5 @@ namespace OpenRA return path; } - - /// - /// Replace the full path prefix with the special notation characters ^ or . - /// and transforms \ path separators to / on Windows - /// - public static string UnresolvePath(string path) - { - // Use a case insensitive comparison on windows to avoid problems - // with inconsistent drive letter case - var compare = CurrentPlatform == PlatformType.Windows ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal; - if (path.StartsWith(SupportDir, compare)) - path = "^" + path.Substring(SupportDir.Length); - - if (path.StartsWith(GameDir, compare)) - path = "./" + path.Substring(GameDir.Length); - - if (CurrentPlatform == PlatformType.Windows) - path = path.Replace('\\', '/'); - - return path; - } } } diff --git a/OpenRA.Mods.Common/UtilityCommands/ExtractLanguageStringsCommand.cs b/OpenRA.Mods.Common/UtilityCommands/ExtractLanguageStringsCommand.cs index 7b88f6abb3..2dd8d140a0 100644 --- a/OpenRA.Mods.Common/UtilityCommands/ExtractLanguageStringsCommand.cs +++ b/OpenRA.Mods.Common/UtilityCommands/ExtractLanguageStringsCommand.cs @@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.UtilityCommands { modData.ModFiles.TryGetPackageContaining(filename, out var package, out var name); name = package.Name + "/" + name; - Console.WriteLine("# {0}:", Platform.UnresolvePath(name)); + Console.WriteLine("# {0}:", filename); var yaml = MiniYaml.FromFile(name, false); FromChromeLayout(ref yaml, null, diff --git a/OpenRA.Test/OpenRA.Game/PlatformTest.cs b/OpenRA.Test/OpenRA.Game/PlatformTest.cs index a1bc760149..4f583b1d5d 100644 --- a/OpenRA.Test/OpenRA.Game/PlatformTest.cs +++ b/OpenRA.Test/OpenRA.Game/PlatformTest.cs @@ -45,18 +45,5 @@ namespace OpenRA.Test Assert.That(Platform.ResolvePath("testpath"), Is.EqualTo("testpath")); } - - [TestCase(TestName = "Returns encoded paths")] - public void UnresolvePath() - { - Assert.That(Platform.UnresolvePath(Path.Combine(supportDir, "testpath")), - Is.EqualTo("^testpath")); - - Assert.That(Platform.UnresolvePath(Path.Combine(gameDir, "testpath")), - Is.EqualTo("./testpath")); - - Assert.That(Platform.UnresolvePath("testpath"), - Is.EqualTo("testpath")); - } } }