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

Support for master game ID.

Browse Source
This commit is contained in:
Matthew Bowra-Dean
2010-05-28 23:22:08 +12:00
parent 1839655eb5
commit fd014e15a5
9 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Widgets.Delegates
return true;
};
r.GetWidget("CONNECTION_BUTTON_RETRY").OnMouseUp = mi => {
Game.JoinServer(Game.CurrentHost, Game.CurrentPort);
Game.JoinServer(Game.MasterGameID, Game.CurrentHost, Game.CurrentPort);
return true;
};

2
OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
View File

@@ -58,7 +58,7 @@ namespace OpenRA.Widgets.Delegates
Game.Settings.ExternalPort, mods, map);
Log.Write("Joining server");
Game.JoinServer(IPAddress.Loopback.ToString(), Game.Settings.ListenPort);
Game.JoinServer(0, IPAddress.Loopback.ToString(), Game.Settings.ListenPort);
return true;
};

4
OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
View File

@@ -76,7 +76,7 @@ namespace OpenRA.Widgets.Delegates
OnMouseUp = nmi =>
{
r.GetWidget("JOINSERVER_BG").Visible = false;
Game.JoinServer(g.Address.Split(':')[0], int.Parse(g.Address.Split(':')[1]));
Game.JoinServer(g.Id, g.Address.Split(':')[0], int.Parse(g.Address.Split(':')[1]));
return true;
},
};
@@ -128,7 +128,7 @@ namespace OpenRA.Widgets.Delegates
r.GetWidget("JOINSERVER_BUTTON_DIRECTCONNECT").OnMouseUp = mi =>
{ /* rude hack. kill this as soon as we can do a direct connect via the commandline */
r.CloseWindow();
Game.JoinServer(Game.Settings.NetworkHost, Game.Settings.NetworkPort);
Game.JoinServer(0, Game.Settings.NetworkHost, Game.Settings.NetworkPort);
return true;
};
}