Log channels, PHP script diffs when told.

This commit is contained in:
Matthew Bowra-Dean
2010-06-10 12:41:15 +12:00
parent 5f48577ebc
commit aa239d172d
16 changed files with 253 additions and 66 deletions

View File

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

View File

@@ -42,7 +42,7 @@ namespace OpenRA.Widgets.Delegates
r.GetWidget("CREATESERVER_BUTTON_START").OnMouseUp = mi => {
r.OpenWindow("SERVER_LOBBY");
Log.Write("Creating server");
Log.Write("debug", "Creating server");
// TODO: Get this from a map chooser
string map = Game.AvailableMaps.Keys.FirstOrDefault();
@@ -57,8 +57,8 @@ namespace OpenRA.Widgets.Delegates
gameName, Game.Settings.ListenPort,
Game.Settings.ExternalPort, mods, map);
Log.Write("Joining server");
Game.JoinServer(0, IPAddress.Loopback.ToString(), Game.Settings.ListenPort);
Log.Write("debug", "Joining server");
Game.JoinServer(IPAddress.Loopback.ToString(), Game.Settings.ListenPort);
return true;
};

View File

@@ -76,7 +76,8 @@ namespace OpenRA.Widgets.Delegates
OnMouseUp = nmi =>
{
r.GetWidget("JOINSERVER_BG").Visible = false;
Game.JoinServer(g.Id, g.Address.Split(':')[0], int.Parse(g.Address.Split(':')[1]));
Game.JoinServer(g.Address.Split(':')[0], int.Parse(g.Address.Split(':')[1]));
Game.SetGameId(g.Id);
return true;
},
};
@@ -128,7 +129,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(0, Game.Settings.NetworkHost, Game.Settings.NetworkPort);
Game.JoinServer(Game.Settings.NetworkHost, Game.Settings.NetworkPort);
return true;
};
}