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

Remember to disconnect ingame too, and mark the game as not started.

Browse Source 
Also fix a compiler warning
This commit is contained in:
alzeih
2010-07-23 18:27:28 +12:00
committed by Chris Forbes
parent 9516235707
commit 282d26b844
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -33,7 +33,6 @@ namespace OpenRA.Graphics
public int Width { get { return (int)screenSize.X; } } public int Width { get { return (int)screenSize.X; } }
public int Height { get { return (int)screenSize.Y; } } public int Height { get { return (int)screenSize.Y; } }
SpriteRenderer cursorRenderer;
int2 mousePos; int2 mousePos;
float cursorFrame = 0f; float cursorFrame = 0f;
@@ -48,7 +47,6 @@ namespace OpenRA.Graphics
{ {
this.screenSize = screenSize; this.screenSize = screenSize;
this.renderer = renderer; this.renderer = renderer;
cursorRenderer = renderer.SpriteRenderer;
this.scrollPosition = Game.CellSize* mapStart; this.scrollPosition = Game.CellSize* mapStart;
} }

1
OpenRA.Game/Server/Server.cs
View File

@@ -431,6 +431,7 @@ namespace OpenRA.Server
DropClient(conns.ElementAt(conns.Count() - 1), null); DropClient(conns.ElementAt(conns.Count() - 1), null);
if (listener != null) if (listener != null)
listener.Stop(); listener.Stop();
GameStarted = false;
} }
static void SyncLobbyInfo() static void SyncLobbyInfo()

1
OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs
View File

@@ -55,6 +55,7 @@ namespace OpenRA.Widgets.Delegates
case ConnectionState.Connected: case ConnectionState.Connected:
r.OpenWindow("SERVER_LOBBY"); r.OpenWindow("SERVER_LOBBY");
r.GetWidget("SERVER_LOBBY").GetWidget<ChatDisplayWidget>("CHAT_DISPLAY").ClearChat(); r.GetWidget("SERVER_LOBBY").GetWidget<ChatDisplayWidget>("CHAT_DISPLAY").ClearChat();
r.GetWidget("INGAME_ROOT").GetWidget<ChatDisplayWidget>("CHAT_DISPLAY").ClearChat();
break; break;
} }
}; };

4
OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs
View File

@@ -29,7 +29,9 @@ namespace OpenRA.Widgets.Delegates
}; };
optionsBG.GetWidget("BUTTON_DISCONNECT").OnMouseUp = mi => { optionsBG.GetWidget("BUTTON_DISCONNECT").OnMouseUp = mi => {
optionsBG.Visible = false; optionsBG.Visible = false;
if (Game.IsHost)
Server.Server.CloseServer();
Game.Disconnect(); Game.Disconnect();
return true; return true;
}; };