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

Support loopback servers for solo play

Browse Source
This commit is contained in:
Paul Chote
2011-05-10 17:29:32 +12:00
parent b1a6eec3d3
commit 33a4f5e29e
6 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs
View File

@@ -10,6 +10,7 @@
using System.Collections.Generic;
using OpenRA.FileFormats;
using System.Net;
using OpenRA.Network;
using OpenRA.Server;
using OpenRA.Widgets;
@@ -68,8 +69,8 @@ namespace OpenRA.Mods.Cnc.Widgets
Menu = MenuType.None;
Widget.OpenWindow("SERVERBROWSER_PANEL", new Dictionary<string, object>()
{
{"onExit", new Action(ReturnToMultiplayerMenu)},
{ "openLobby", new Action(() => OpenLobbyPanel(MenuType.Main)) }
{ "onExit", new Action(() => ReturnToMenu(MenuType.Multiplayer)) },
{ "openLobby", new Action(() => OpenLobbyPanel(MenuType.Multiplayer)) }
});
};
@@ -78,7 +79,7 @@ namespace OpenRA.Mods.Cnc.Widgets
Menu = MenuType.None;
Widget.OpenWindow("CREATESERVER_PANEL", new Dictionary<string, object>()
{
{ "onExit", new Action(ReturnToMultiplayerMenu) },
{ "onExit", new Action(() => ReturnToMenu(MenuType.Multiplayer)) },
{ "openLobby", new Action(() => OpenLobbyPanel(MenuType.Multiplayer)) }
});
};
@@ -88,7 +89,7 @@ namespace OpenRA.Mods.Cnc.Widgets
Menu = MenuType.None;
Widget.OpenWindow("DIRECTCONNECT_PANEL", new Dictionary<string, object>()
{
{ "onExit", new Action(ReturnToMultiplayerMenu) },
{ "onExit", new Action(() => ReturnToMenu(MenuType.Multiplayer)) },
{ "openLobby", new Action(() => OpenLobbyPanel(MenuType.Multiplayer)) }
});
};
@@ -103,9 +104,9 @@ namespace OpenRA.Mods.Cnc.Widgets
settingsMenu.GetWidget<CncMenuButtonWidget>("BACK_BUTTON").OnClick = () => Menu = MenuType.Main;
}
void ReturnToMultiplayerMenu()
void ReturnToMenu(MenuType menu)
{
Menu = MenuType.Multiplayer;
Menu = menu;
Widget.CloseWindow();
}
@@ -118,18 +119,10 @@ namespace OpenRA.Mods.Cnc.Widgets
void OpenLobbyPanel(MenuType menu)
{
// Quit the lobby: disconnect and restore menu
Action onLobbyClose = () =>
{
Game.DisconnectOnly();
Menu = menu;
Widget.CloseWindow();
};
Menu = MenuType.None;
Game.OpenWindow("SERVER_LOBBY", new Dictionary<string, object>()
{
{ "onExit", onLobbyClose },
{ "onExit", new Action(() => { Game.DisconnectOnly(); ReturnToMenu(menu); }) },
{ "onStart", new Action(RemoveShellmapUI) }
});
}
@@ -138,14 +131,11 @@ namespace OpenRA.Mods.Cnc.Widgets
{
var map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Key;
var settings = Game.Settings;
settings.Server.Name = "Skirmish Game";
// TODO: we want to prevent binding a port altogether
settings.Server.ListenPort = 1234;
settings.Server.ExternalPort = 1234;
Game.CreateAndJoinServer(settings, map);
OpenLobbyPanel(MenuType.Main);
Game.CreateLocalServer(map);
CncConnectingLogic.Connect(IPAddress.Loopback.ToString(),
Game.Settings.Server.LoopbackPort,
new Action(() => OpenLobbyPanel(MenuType.Main)),
new Action(() => ReturnToMenu(MenuType.Main)));
}
}
}

20
OpenRA.Mods.Cnc/Widgets/CncServerCreationLogic.cs
View File

@@ -71,14 +71,24 @@ namespace OpenRA.Mods.Cnc.Widgets
void CreateAndJoin()
{
Game.Settings.Server.Name = panel.GetWidget<TextFieldWidget>("SERVER_NAME").Text;
Game.Settings.Server.ListenPort = int.Parse(panel.GetWidget<TextFieldWidget>("LISTEN_PORT").Text);
Game.Settings.Server.ExternalPort = int.Parse(panel.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text);
var name = panel.GetWidget<TextFieldWidget>("SERVER_NAME").Text;
int listenPort, externalPort;
if (!int.TryParse(panel.GetWidget<TextFieldWidget>("LISTEN_PORT").Text, out listenPort))
listenPort = 1234;
if (!int.TryParse(panel.GetWidget<TextFieldWidget>("EXTERNAL_PORT").Text, out externalPort))
externalPort = 1234;
// Save new settings
Game.Settings.Server.Name = name;
Game.Settings.Server.ListenPort = listenPort;
Game.Settings.Server.ExternalPort = externalPort;
Game.Settings.Server.AdvertiseOnline = advertiseOnline;
Game.Settings.Server.LastMap = map.Uid;
Game.Settings.Save();
Game.CreateServer(Game.Settings, map.Uid);
// Create and join the server
Game.CreateServer(listenPort, name, map.Uid);
Widget.CloseWindow();
CncConnectingLogic.Connect(IPAddress.Loopback.ToString(), Game.Settings.Server.ListenPort, onCreate, onExit);
}