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

added a new Launch.Replay=$FilePath parameter

Browse Source 
that does not persist in settings.yaml
This commit is contained in:
Matthias Mailänder
2013-12-05 23:01:27 +01:00
parent 62ffe4aeaf
commit 3bf385b485
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Game.cs
View File

@@ -318,13 +318,13 @@ namespace OpenRA
foreach (var mod in Mod.AllMods) foreach (var mod in Mod.AllMods)
Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version); Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
InitializeWithMod(Settings.Game.Mod); InitializeWithMod(Settings.Game.Mod, args.GetValue("Launch.Replay", null));
if (Settings.Server.DiscoverNatDevices) if (Settings.Server.DiscoverNatDevices)
RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.TryStoppingNatDiscovery); RunAfterDelay(Settings.Server.NatDiscoveryTimeout, UPnP.TryStoppingNatDiscovery);
} }
public static void InitializeWithMod(string mod) public static void InitializeWithMod(string mod, string replay)
{ {
// Clear static state if we have switched mods // Clear static state if we have switched mods
LobbyInfoChanged = () => { }; LobbyInfoChanged = () => { };
@@ -396,6 +396,8 @@ namespace OpenRA
{ {
modData.LoadScreen.StartGame(); modData.LoadScreen.StartGame();
Settings.Save(); Settings.Save();
if (!string.IsNullOrEmpty(replay))
Game.JoinReplay(replay);
} }
} }

2
OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
Ui.CloseWindow(); Ui.CloseWindow();
onSwitch(); onSwitch();
Game.InitializeWithMod(mod); Game.InitializeWithMod(mod, null);
}); });
} }
} }