start similarly tidying CncServerBrowserLogic

This commit is contained in:
Chris Forbes
2011-09-25 14:57:54 +13:00
parent fdd0897927
commit c4d10f5637

View File

@@ -22,13 +22,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
GameServer currentServer; GameServer currentServer;
ScrollItemWidget serverTemplate; ScrollItemWidget serverTemplate;
bool refreshing; bool refreshing;
enum SearchStatus
{ enum SearchStatus { Fetching, Failed, NoGames, Hidden }
Fetching,
Failed,
NoGames,
Hidden
}
SearchStatus searchStatus = SearchStatus.Fetching; SearchStatus searchStatus = SearchStatus.Fetching;
public string ProgressLabelText() public string ProgressLabelText()
@@ -73,8 +68,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
if (currentServer == null) if (currentServer == null)
return; return;
string host = currentServer.Address.Split(':')[0]; var host = currentServer.Address.Split(':')[0];
int port = int.Parse(currentServer.Address.Split(':')[1]); var port = int.Parse(currentServer.Address.Split(':')[1]);
Widget.CloseWindow(); Widget.CloseWindow();
CncConnectingLogic.Connect(host, port, openLobby, onExit); CncConnectingLogic.Connect(host, port, openLobby, onExit);
@@ -151,8 +146,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
} }
searchStatus = SearchStatus.Hidden; searchStatus = SearchStatus.Hidden;
currentServer = gamesWaiting.FirstOrDefault();
int i = 0;
foreach (var loop in gamesWaiting) foreach (var loop in gamesWaiting)
{ {
var game = loop; var game = loop;
@@ -165,9 +160,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
item.GetWidget<LabelWidget>("PLAYERS").GetText = () => GetPlayersLabel(game); item.GetWidget<LabelWidget>("PLAYERS").GetText = () => GetPlayersLabel(game);
item.GetWidget<LabelWidget>("IP").GetText = () => game.Address; item.GetWidget<LabelWidget>("IP").GetText = () => game.Address;
sl.AddChild(item); sl.AddChild(item);
if (i == 0) currentServer = game;
i++;
} }
} }
} }