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

Require Game.Mod to be give an a launch arg to OpenRA.Game.exe.

Browse Source
This commit is contained in:
Paul Chote
2017-04-21 16:55:16 +00:00
parent 215aa6fa60
commit 688feea33b
5 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Game.cs
View File

@@ -248,12 +248,12 @@ namespace OpenRA
// Special case handling of Game.Mod argument: if it matches a real filesystem path
// then we use this to override the mod search path, and replace it with the mod id
var modArgument = args.GetValue("Game.Mod", null);
var modID = args.GetValue("Game.Mod", null);
var explicitModPaths = new string[0];
if (modArgument != null && (File.Exists(modArgument) || Directory.Exists(modArgument)))
if (modID != null && (File.Exists(modID) || Directory.Exists(modID)))
{
explicitModPaths = new[] { modArgument };
args.ReplaceValue("Game.Mod", Path.GetFileNameWithoutExtension(modArgument));
explicitModPaths = new[] { modID };
modID = Path.GetFileNameWithoutExtension(modID);
}
InitializeSettings(args);
@@ -330,7 +330,7 @@ namespace OpenRA
foreach (var mod in ExternalMods)
Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
InitializeMod(Settings.Game.Mod, args);
InitializeMod(modID, args);
}
public static void InitializeMod(string mod, Arguments args)
@@ -360,12 +360,10 @@ namespace OpenRA
ModData = null;
// Fall back to default if the mod doesn't exist
if (mod == null)
mod = args.GetValue("Engine.DefaultMod", "modchooser");
throw new InvalidOperationException("Game.Mod argument missing or mod could not be found.");
Console.WriteLine("Loading mod: {0}", mod);
Settings.Game.Mod = mod;
Sound.StopVideo();