Use Platform.GameDir explicitly in hardcoded paths.
This commit is contained in:
@@ -354,7 +354,7 @@ namespace OpenRA
|
|||||||
var modSearchArg = args.GetValue("Engine.ModSearchPaths", null);
|
var modSearchArg = args.GetValue("Engine.ModSearchPaths", null);
|
||||||
var modSearchPaths = modSearchArg != null ?
|
var modSearchPaths = modSearchArg != null ?
|
||||||
FieldLoader.GetValue<string[]>("Engine.ModsPath", modSearchArg) :
|
FieldLoader.GetValue<string[]>("Engine.ModsPath", modSearchArg) :
|
||||||
new[] { Path.Combine(".", "mods") };
|
new[] { Path.Combine(Platform.GameDir, "mods") };
|
||||||
|
|
||||||
Mods = new InstalledMods(modSearchPaths, explicitModPaths);
|
Mods = new InstalledMods(modSearchPaths, explicitModPaths);
|
||||||
Console.WriteLine("Internal mods:");
|
Console.WriteLine("Internal mods:");
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
maps = modData.MapCache.EnumerateMapsWithoutCaching().ToList();
|
maps = modData.MapCache.EnumerateMapsWithoutCaching().ToList();
|
||||||
}
|
}
|
||||||
else
|
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)
|
foreach (var testMap in maps)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
var palette = new ImmutablePalette(args[1], new int[0]);
|
var palette = new ImmutablePalette(args[1], new int[0]);
|
||||||
|
|
||||||
SequenceProvider sequences = null;
|
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)
|
if (mapPackage != null)
|
||||||
sequences = new Map(modData, mapPackage).Rules.Sequences;
|
sequences = new Map(modData, mapPackage).Rules.Sequences;
|
||||||
else if (!modData.DefaultSequences.TryGetValue(args[2], out sequences))
|
else if (!modData.DefaultSequences.TryGetValue(args[2], out sequences))
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
{
|
{
|
||||||
var modData = Game.ModData = utility.ModData;
|
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, "Rules", map.RuleDefinitions);
|
||||||
MergeAndPrint(map, "Sequences", map.SequenceDefinitions);
|
MergeAndPrint(map, "Sequences", map.SequenceDefinitions);
|
||||||
MergeAndPrint(map, "ModelSequences", map.ModelSequenceDefinitions);
|
MergeAndPrint(map, "ModelSequences", map.ModelSequenceDefinitions);
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
[Desc("MAPFILE", "Generate hash of specified oramap file.")]
|
[Desc("MAPFILE", "Generate hash of specified oramap file.")]
|
||||||
void IUtilityCommand.Run(Utility utility, string[] args)
|
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));
|
Console.WriteLine(Map.ComputeUID(package));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
// HACK: The engine code assumes that Game.modData is set.
|
// HACK: The engine code assumes that Game.modData is set.
|
||||||
// HACK: We know that maps can only be oramap or folders, which are ReadWrite
|
// HACK: We know that maps can only be oramap or folders, which are ReadWrite
|
||||||
var modData = Game.ModData = utility.ModData;
|
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);
|
new Map(modData, package).Save((IReadWritePackage)package);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
void IUtilityCommand.Run(Utility utility, string[] args)
|
void IUtilityCommand.Run(Utility utility, string[] args)
|
||||||
{
|
{
|
||||||
var modData = Game.ModData = utility.ModData;
|
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);
|
Console.WriteLine("Resizing map {0} from {1} to {2},{3}", map.Title, map.MapSize, width, height);
|
||||||
map.Resize(width, height);
|
map.Resize(width, height);
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
var modData = Game.ModData = utility.ModData;
|
var modData = Game.ModData = utility.ModData;
|
||||||
|
|
||||||
// HACK: We know that maps can only be oramap or folders, which are ReadWrite
|
// 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)
|
if (package == null)
|
||||||
throw new FileNotFoundException(args[1]);
|
throw new FileNotFoundException(args[1]);
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
|
|||||||
{
|
{
|
||||||
try
|
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)
|
catch (InvalidDataException ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ namespace OpenRA.Server
|
|||||||
var envModSearchPaths = Environment.GetEnvironmentVariable("MOD_SEARCH_PATHS");
|
var envModSearchPaths = Environment.GetEnvironmentVariable("MOD_SEARCH_PATHS");
|
||||||
var modSearchPaths = !string.IsNullOrWhiteSpace(envModSearchPaths) ?
|
var modSearchPaths = !string.IsNullOrWhiteSpace(envModSearchPaths) ?
|
||||||
FieldLoader.GetValue<string[]>("MOD_SEARCH_PATHS", envModSearchPaths) :
|
FieldLoader.GetValue<string[]>("MOD_SEARCH_PATHS", envModSearchPaths) :
|
||||||
new[] { Path.Combine(".", "mods") };
|
new[] { Path.Combine(Platform.GameDir, "mods") };
|
||||||
|
|
||||||
var mods = new InstalledMods(modSearchPaths, explicitModPaths);
|
var mods = new InstalledMods(modSearchPaths, explicitModPaths);
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ namespace OpenRA
|
|||||||
var envModSearchPaths = Environment.GetEnvironmentVariable("MOD_SEARCH_PATHS");
|
var envModSearchPaths = Environment.GetEnvironmentVariable("MOD_SEARCH_PATHS");
|
||||||
var modSearchPaths = !string.IsNullOrWhiteSpace(envModSearchPaths) ?
|
var modSearchPaths = !string.IsNullOrWhiteSpace(envModSearchPaths) ?
|
||||||
FieldLoader.GetValue<string[]>("MOD_SEARCH_PATHS", envModSearchPaths) :
|
FieldLoader.GetValue<string[]>("MOD_SEARCH_PATHS", envModSearchPaths) :
|
||||||
new[] { Path.Combine(".", "mods") };
|
new[] { Path.Combine(Platform.GameDir, "mods") };
|
||||||
|
|
||||||
if (args.Length == 0)
|
if (args.Length == 0)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user