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

Use Platform.GameDir explicitly in hardcoded paths.

Browse Source
This commit is contained in:
Paul Chote
2020-11-20 17:44:53 +00:00
committed by abcdefg30
parent de7a84e8ed
commit 888915b53b
11 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -354,7 +354,7 @@ namespace OpenRA
var modSearchArg = args.GetValue("Engine.ModSearchPaths", null);
var modSearchPaths = modSearchArg != null ?
FieldLoader.GetValue<string[]>("Engine.ModsPath", modSearchArg) :
new[] { Path.Combine(".", "mods") };
new[] { Path.Combine(Platform.GameDir, "mods") };
Mods = new InstalledMods(modSearchPaths, explicitModPaths);
Console.WriteLine("Internal mods:");

2
OpenRA.Mods.Common/UtilityCommands/CheckYaml.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
maps = modData.MapCache.EnumerateMapsWithoutCaching().ToList();
}
else
maps.Add(new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles)));
maps.Add(new Map(modData, new Folder(Platform.GameDir).OpenPackage(args[1], modData.ModFiles)));
foreach (var testMap in maps)
{

2
OpenRA.Mods.Common/UtilityCommands/DumpSequenceSheetsCommand.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var palette = new ImmutablePalette(args[1], new int[0]);
SequenceProvider sequences = null;
var mapPackage = new Folder(".").OpenPackage(args[2], modData.ModFiles);
var mapPackage = new Folder(Platform.GameDir).OpenPackage(args[2], modData.ModFiles);
if (mapPackage != null)
sequences = new Map(modData, mapPackage).Rules.Sequences;
else if (!modData.DefaultSequences.TryGetValue(args[2], out sequences))

2
OpenRA.Mods.Common/UtilityCommands/ExtractMapRules.cs
View File

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{
var modData = Game.ModData = utility.ModData;
var map = new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles));
var map = new Map(modData, new Folder(Platform.GameDir).OpenPackage(args[1], modData.ModFiles));
MergeAndPrint(map, "Rules", map.RuleDefinitions);
MergeAndPrint(map, "Sequences", map.SequenceDefinitions);
MergeAndPrint(map, "ModelSequences", map.ModelSequenceDefinitions);

2
OpenRA.Mods.Common/UtilityCommands/GetMapHashCommand.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
[Desc("MAPFILE", "Generate hash of specified oramap file.")]
void IUtilityCommand.Run(Utility utility, string[] args)
{
using (var package = new Folder(".").OpenPackage(args[1], utility.ModData.ModFiles))
using (var package = new Folder(Platform.GameDir).OpenPackage(args[1], utility.ModData.ModFiles))
Console.WriteLine(Map.ComputeUID(package));
}
}

2
OpenRA.Mods.Common/UtilityCommands/RefreshMapCommand.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
// HACK: The engine code assumes that Game.modData is set.
// HACK: We know that maps can only be oramap or folders, which are ReadWrite
var modData = Game.ModData = utility.ModData;
using (var package = new Folder(".").OpenPackage(args[1], modData.ModFiles))
using (var package = new Folder(Platform.GameDir).OpenPackage(args[1], modData.ModFiles))
new Map(modData, package).Save((IReadWritePackage)package);
}
}

2
OpenRA.Mods.Common/UtilityCommands/ResizeMapCommand.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
void IUtilityCommand.Run(Utility utility, string[] args)
{
var modData = Game.ModData = utility.ModData;
map = new Map(modData, new Folder(".").OpenPackage(args[1], modData.ModFiles));
map = new Map(modData, new Folder(Platform.GameDir).OpenPackage(args[1], modData.ModFiles));
Console.WriteLine("Resizing map {0} from {1} to {2},{3}", map.Title, map.MapSize, width, height);
map.Resize(width, height);

2
OpenRA.Mods.Common/UtilityCommands/UpdateMapCommand.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
var modData = Game.ModData = utility.ModData;
// HACK: We know that maps can only be oramap or folders, which are ReadWrite
var package = new Folder(".").OpenPackage(args[1], modData.ModFiles) as IReadWritePackage;
var package = new Folder(Platform.GameDir).OpenPackage(args[1], modData.ModFiles) as IReadWritePackage;
if (package == null)
throw new FileNotFoundException(args[1]);

2
OpenRA.Mods.Common/UtilityCommands/Utilities.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
{
try
{
map = new Map(modData, new Folder(".").OpenPackage(mapPath, modData.ModFiles));
map = new Map(modData, new Folder(Platform.GameDir).OpenPackage(mapPath, modData.ModFiles));
}
catch (InvalidDataException ex)
{

2
OpenRA.Server/Program.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Server
var envModSearchPaths = Environment.GetEnvironmentVariable("MOD_SEARCH_PATHS");
var modSearchPaths = !string.IsNullOrWhiteSpace(envModSearchPaths) ?
FieldLoader.GetValue<string[]>("MOD_SEARCH_PATHS", envModSearchPaths) :
new[] { Path.Combine(".", "mods") };
new[] { Path.Combine(Platform.GameDir, "mods") };
var mods = new InstalledMods(modSearchPaths, explicitModPaths);

2
OpenRA.Utility/Program.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA
var envModSearchPaths = Environment.GetEnvironmentVariable("MOD_SEARCH_PATHS");
var modSearchPaths = !string.IsNullOrWhiteSpace(envModSearchPaths) ?
FieldLoader.GetValue<string[]>("MOD_SEARCH_PATHS", envModSearchPaths) :
new[] { Path.Combine(".", "mods") };
new[] { Path.Combine(Platform.GameDir, "mods") };
if (args.Length == 0)
{