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

Merge pull request #10543 from whinis/RestartSkirmish

Browse Source 
Restart skirmish matches
This commit is contained in:
Oliver Brakmann
2016-02-09 20:42:02 +01:00
parent 93466c74ba f2260174f0
commit 6093398de3
4 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Game/Game.cs
View File

@@ -179,8 +179,11 @@ namespace OpenRA
{
var replay = OrderManager.Connection as ReplayConnection;
var replayName = replay != null ? replay.Filename : null;
var uid = OrderManager.World.Map.Uid;
var globalSettings = OrderManager.LobbyInfo.GlobalSettings;
var lobbyInfo = OrderManager.LobbyInfo;
var orders = new[] {
Order.Command("sync_lobby {0}".F(lobbyInfo.Serialize())),
Order.Command("startgame")
};
// Disconnect from the current game
Disconnect();
@@ -190,10 +193,10 @@ namespace OpenRA
if (replay != null)
JoinReplay(replayName);
else
StartMission(uid, globalSettings.GameSpeedType, globalSettings.Difficulty);
CreateAndStartLocalServer(lobbyInfo.GlobalSettings.Map, orders);
}
public static void StartMission(string mapUID, string gameSpeed, string difficulty, Action onStart = null)
public static void CreateAndStartLocalServer(string mapUID, IEnumerable<Order> setupOrders, Action onStart = null)
{
OrderManager om = null;
@@ -201,9 +204,9 @@ namespace OpenRA
lobbyReady = () =>
{
LobbyInfoChanged -= lobbyReady;
om.IssueOrder(Order.Command("gamespeed {0}".F(gameSpeed)));
om.IssueOrder(Order.Command("difficulty {0}".F(difficulty)));
om.IssueOrder(Order.Command("state {0}".F(Session.ClientState.Ready)));
foreach (var o in setupOrders)
om.IssueOrder(o);
if (onStart != null)
onStart();
};