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

Replace ^ and . in platform paths with ^SupportDir and ^EngineDir.

Browse Source
This commit is contained in:
Paul Chote
2020-11-21 15:35:41 +00:00
committed by teinarss
parent 1cc1f93fb0
commit dd0b08d54a
36 changed files with 6205 additions and 6210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/FileSystem/FileSystem.cs
View File

@@ -63,7 +63,7 @@ namespace OpenRA.FileSystem
{
// Raw directories are the easiest and one of the most common cases, so try these first
var resolvedPath = Platform.ResolvePath(filename);
if (!filename.Contains("|") && Directory.Exists(resolvedPath))
if (!resolvedPath.Contains("|") && Directory.Exists(resolvedPath))
return new Folder(resolvedPath);
// Children of another package require special handling
@@ -295,7 +295,7 @@ namespace OpenRA.FileSystem
public static string ResolveAssemblyPath(string path, Manifest manifest, InstalledMods installedMods)
{
var explicitSplit = path.IndexOf('|');
if (explicitSplit > 0)
if (explicitSplit > 0 && !path.StartsWith("^"))
{
var parent = path.Substring(0, explicitSplit);
var filename = path.Substring(explicitSplit + 1);

15
OpenRA.Game/Platform.cs
View File

@@ -188,16 +188,17 @@ namespace OpenRA
{
path = path.TrimEnd(' ', '\t');
// Paths starting with ^ are relative to the support dir
if (path.StartsWith("^", StringComparison.Ordinal))
path = SupportDir + path.Substring(1);
if (path == "^SupportDir")
return SupportDir;
// Paths starting with . are relative to the game dir
if (path == ".")
if (path == "^EngineDir")
return EngineDir;
if (path.StartsWith("./", StringComparison.Ordinal) || path.StartsWith(".\\", StringComparison.Ordinal))
path = EngineDir + path.Substring(2);
if (path.StartsWith("^SupportDir|", StringComparison.Ordinal))
path = SupportDir + path.Substring(12);
if (path.StartsWith("^EngineDir|", StringComparison.Ordinal))
path = EngineDir + path.Substring(11);
return path;
}