epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Platform.IsPathRelativeToSupportDirectory.

Browse Source
This commit is contained in:
Paul Chote
2020-11-20 17:56:47 +00:00
committed by abcdefg30
parent 888915b53b
commit 151cea96e9
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Platform.cs
View File

@@ -22,7 +22,6 @@ namespace OpenRA
public static class Platform
{
public const string SupportDirPrefix = "^";
public static PlatformType CurrentPlatform { get { return currentPlatform.Value; } }
public static readonly Guid SessionGUID = Guid.NewGuid();
@@ -190,7 +189,7 @@ namespace OpenRA
path = path.TrimEnd(' ', '\t');
// Paths starting with ^ are relative to the support dir
if (IsPathRelativeToSupportDirectory(path))
if (path.StartsWith("^", StringComparison.Ordinal))
path = SupportDir + path.Substring(1);
// Paths starting with . are relative to the game dir
@@ -213,7 +212,7 @@ namespace OpenRA
// with inconsistent drive letter case
var compare = CurrentPlatform == PlatformType.Windows ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
if (path.StartsWith(SupportDir, compare))
path = SupportDirPrefix + path.Substring(SupportDir.Length);
path = "^" + path.Substring(SupportDir.Length);
if (path.StartsWith(GameDir, compare))
path = "./" + path.Substring(GameDir.Length);
@@ -223,10 +222,5 @@ namespace OpenRA
return path;
}
public static bool IsPathRelativeToSupportDirectory(string path)
{
return path.StartsWith(SupportDirPrefix, StringComparison.Ordinal);
}
}
}