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

Create SupportDirPrefix and IsPathRelativeToSupportDirectory() as members on Platform class.

Browse Source
This commit is contained in:
Peter Antal
2018-03-04 22:04:39 -08:00
committed by Paul Chote
parent 1f4573886b
commit 3ce2417a06
7 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Platform.cs
View File

@@ -21,6 +21,7 @@ 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();
@@ -143,7 +144,7 @@ namespace OpenRA
path = path.TrimEnd(' ', '\t');
// Paths starting with ^ are relative to the support dir
if (path.StartsWith("^", StringComparison.Ordinal))
if (Platform.IsPathRelativeToSupportDirectory(path))
path = SupportDir + path.Substring(1);
// Paths starting with . are relative to the game dir
@@ -166,12 +167,17 @@ namespace OpenRA
public static string UnresolvePath(string path)
{
if (path.StartsWith(SupportDir, StringComparison.Ordinal))
path = "^" + path.Substring(SupportDir.Length);
path = Platform.SupportDirPrefix + path.Substring(SupportDir.Length);
if (path.StartsWith(GameDir, StringComparison.Ordinal))
path = "./" + path.Substring(GameDir.Length);
return path;
}
public static bool IsPathRelativeToSupportDirectory(string path)
{
return path.StartsWith(Platform.SupportDirPrefix, StringComparison.Ordinal);
}
}
}