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

Can now start a game and disconnect from lobby without triggering a reload.

Browse Source 
It is now possible to crash the game by starting a new server before the previous one has had time to timeout and release the port binding (the previous loadscreen pause meant this was always hidden).
This commit is contained in:
Paul Chote
2011-05-06 23:18:26 +12:00
parent 03264fa2ca
commit 6cb0cb7d0e
9 changed files with 590 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs
View File

@@ -29,18 +29,63 @@ namespace OpenRA.Mods.Cnc.Widgets
Map Map;
public static ColorRamp CurrentColorPreview;
// Must be set only once on game start
// TODO: This is stupid
static bool staticSetup;
public static void GameStartingStub()
{
var panel = Widget.RootWidget.GetWidget("SERVER_LOBBY");
// The panel may not be open anymore
if (panel == null)
return;
var lobbyLogic = panel.DelegateObject as CncLobbyLogic;
if (lobbyLogic == null)
return;
lobbyLogic.onGameStart();
}
public static void UpdateCurrentMapStub()
{
var panel = Widget.RootWidget.GetWidget("SERVER_LOBBY");
// The panel may not be open anymore
if (panel == null)
return;
var lobbyLogic = panel.DelegateObject as CncLobbyLogic;
if (lobbyLogic == null)
return;
lobbyLogic.UpdateCurrentMap();
}
readonly Action onGameStart;
readonly OrderManager orderManager;
readonly WorldRenderer worldRenderer;
[ObjectCreator.UseCtor]
internal CncLobbyLogic([ObjectCreator.Param( "widget" )] Widget lobby,
[ObjectCreator.Param] OrderManager orderManager,
[ObjectCreator.Param] Action onExit,
[ObjectCreator.Param] Action onStart,
[ObjectCreator.Param] WorldRenderer worldRenderer)
{
this.orderManager = orderManager;
this.worldRenderer = worldRenderer;
this.onGameStart = onStart;
if (!staticSetup)
{
staticSetup = true;
Game.LobbyInfoChanged += UpdateCurrentMapStub;
Game.BeforeGameStart += GameStartingStub;
}
Game.LobbyInfoChanged += UpdateCurrentMap;
UpdateCurrentMap();
CurrentColorPreview = Game.Settings.Player.ColorRamp;
@@ -103,9 +148,7 @@ namespace OpenRA.Mods.Cnc.Widgets
var disconnectButton = lobby.GetWidget("DISCONNECT_BUTTON");
disconnectButton.OnMouseUp = mi =>
{
Game.Disconnect();
Widget.CloseWindow();
Widget.LoadWidget("MENU_BACKGROUND");
onExit();
return true;
};