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

change CncConnectingLogic to CncConnectionLogic to match filename

Browse Source
This commit is contained in:
Chris Forbes
2011-11-06 11:21:47 +13:00
parent 9b5c7c2379
commit 314db743fc
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Cnc/Widgets/Logic/CncConnectionLogic.cs
View File

@@ -14,7 +14,7 @@ using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc.Widgets.Logic namespace OpenRA.Mods.Cnc.Widgets.Logic
{ {
public class CncConnectingLogic public class CncConnectionLogic
{ {
Action onConnect, onRetry, onAbort; Action onConnect, onRetry, onAbort;
string host; string host;
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
} }
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public CncConnectingLogic(Widget widget, string host, int port, Action onConnect, Action onRetry, Action onAbort) public CncConnectionLogic(Widget widget, string host, int port, Action onConnect, Action onRetry, Action onAbort)
{ {
this.host = host; this.host = host;
this.port = port; this.port = port;

2
OpenRA.Mods.Cnc/Widgets/Logic/CncDirectConnectLogic.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
Game.Settings.Save(); Game.Settings.Save();
Widget.CloseWindow(); Widget.CloseWindow();
CncConnectingLogic.Connect(ipField.Text, port, openLobby, onExit); CncConnectionLogic.Connect(ipField.Text, port, openLobby, onExit);
}; };
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };

2
OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
View File

@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
Action onRetry = () => Action onRetry = () =>
{ {
CloseWindow(); CloseWindow();
CncConnectingLogic.Connect(om.Host, om.Port, onConnect, onExit); CncConnectionLogic.Connect(om.Host, om.Port, onConnect, onExit);
}; };
Widget.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs() Widget.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()

2
OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
View File

@@ -142,7 +142,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
{ {
var map = WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map); var map = WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map);
CncConnectingLogic.Connect(IPAddress.Loopback.ToString(), CncConnectionLogic.Connect(IPAddress.Loopback.ToString(),
Game.CreateLocalServer(map), Game.CreateLocalServer(map),
() => OpenLobbyPanel(MenuType.Main, true), () => OpenLobbyPanel(MenuType.Main, true),
() => { Game.CloseServer(); Menu = MenuType.Main; }); () => { Game.CloseServer(); Menu = MenuType.Main; });

2
OpenRA.Mods.Cnc/Widgets/Logic/CncServerBrowserLogic.cs
View File

@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
var 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); CncConnectionLogic.Connect(host, port, openLobby, onExit);
}; };
panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; panel.GetWidget<ButtonWidget>("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); };

2
OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs
View File

@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
// Create and join the server // Create and join the server
Game.CreateServer(settings); Game.CreateServer(settings);
Widget.CloseWindow(); Widget.CloseWindow();
CncConnectingLogic.Connect(IPAddress.Loopback.ToString(), Game.Settings.Server.ListenPort, onCreate, onExit); CncConnectionLogic.Connect(IPAddress.Loopback.ToString(), Game.Settings.Server.ListenPort, onCreate, onExit);
} }
} }
} }

2
mods/cnc/chrome/connection.yaml
View File

@@ -1,6 +1,6 @@
Container@CONNECTING_PANEL: Container@CONNECTING_PANEL:
Id:CONNECTING_PANEL Id:CONNECTING_PANEL
Logic:CncConnectingLogic Logic:CncConnectionLogic
X:(WINDOW_RIGHT - WIDTH)/2 X:(WINDOW_RIGHT - WIDTH)/2
Y:(WINDOW_BOTTOM - 90)/2 Y:(WINDOW_BOTTOM - 90)/2
Width:370 Width:370