From 8eb4e663d28810e0e7f2ed9d6cbd4d2ead1bd793 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Sun, 22 May 2011 13:23:27 +1200
Subject: [PATCH] Fix obsolete Game.Disconnect()

---
 OpenRA.Game/Game.cs                                    | 10 +---------
 OpenRA.Mods.Cnc/Widgets/CncIngameMenuLogic.cs          |  2 +-
 OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs                |  2 +-
 .../Widgets/Delegates/ConnectionDialogsDelegate.cs     |  2 ++
 .../Widgets/Delegates/IngameChromeDelegate.cs          |  1 +
 .../Widgets/Delegates/IngameObserverChromeDelegate.cs  |  1 +
 OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs      |  1 +
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index 8611a3ae5f..a3f36b7e89 100755
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -346,15 +346,7 @@ namespace OpenRA
 			AddChatLine(Color.White, "Debug", String.Format(s,args)); 
 		}
 		
-		// TODO: Fix ra relying on this behavior, then make this sane
-		[Obsolete] public static void Disconnect()
-		{
-			DisconnectOnly();
-			var shellmap = ChooseShellmap();
-			StartGame(shellmap);
-		}
-		
-		public static void DisconnectOnly()
+		public static void Disconnect()
 		{
 			if (orderManager.world != null)
 				orderManager.world.traitDict.PrintReport();
diff --git a/OpenRA.Mods.Cnc/Widgets/CncIngameMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncIngameMenuLogic.cs
index 3cb2c39b9e..4416aafbc6 100755
--- a/OpenRA.Mods.Cnc/Widgets/CncIngameMenuLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/CncIngameMenuLogic.cs
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Cnc.Widgets
 				world.WorldActor.QueueActivity(new Wait(mpe.Info.FadeLength));
 				world.WorldActor.QueueActivity(new CallFunc(() =>
 				{
-						Game.DisconnectOnly();
+						Game.Disconnect();
 						Widget.RootWidget.RemoveChildren();
 						Game.LoadShellMap();
 				}));
diff --git a/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs
index 34af0966ef..05ea6b17fb 100755
--- a/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/CncMenuLogic.cs
@@ -136,7 +136,7 @@ namespace OpenRA.Mods.Cnc.Widgets
 			Menu = MenuType.None;
 			Game.OpenWindow("SERVER_LOBBY", new WidgetArgs()
 			{
-				{ "onExit", () => { Game.DisconnectOnly(); Menu = menu; } },
+				{ "onExit", () => { Game.Disconnect(); Menu = menu; } },
 				{ "onStart", RemoveShellmapUI }
 			});
 		}
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs
index e338add139..dfb314efce 100644
--- a/OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/ConnectionDialogsDelegate.cs
@@ -24,6 +24,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			widget.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => {
 				widget.GetWidget("CONNECTION_BUTTON_ABORT").Parent.Visible = false;
 				Game.Disconnect();
+				Game.LoadShellMap();
 				Widget.CloseWindow();
 				Widget.OpenWindow("MAINMENU_BG");
 				return true;
@@ -44,6 +45,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			widget.GetWidget("CONNECTION_BUTTON_CANCEL").OnMouseUp = mi => {
 				widget.GetWidget("CONNECTION_BUTTON_CANCEL").Parent.Visible = false;
 				Game.Disconnect();
+				Game.LoadShellMap();
 				Widget.CloseWindow();
 				Widget.OpenWindow("MAINMENU_BG");
 				return true;
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs
index 4c1d4ca3a1..448cf3d34c 100755
--- a/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs
@@ -30,6 +30,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			optionsBG.GetWidget("DISCONNECT").OnMouseUp = mi => {
 				optionsBG.Visible = false;
 				Game.Disconnect();
+				Game.LoadShellMap();
 				Widget.CloseWindow();
 				Widget.OpenWindow("MAINMENU_BG");
 				return true;
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/IngameObserverChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/IngameObserverChromeDelegate.cs
index 52fda8747c..1d57e4fbeb 100644
--- a/OpenRA.Mods.RA/Widgets/Delegates/IngameObserverChromeDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/IngameObserverChromeDelegate.cs
@@ -30,6 +30,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			optionsBG.GetWidget("DISCONNECT").OnMouseUp = mi => {
 				optionsBG.Visible = false;
 				Game.Disconnect();
+				Game.LoadShellMap();
 				Widget.CloseWindow();
 				Widget.OpenWindow("MAINMENU_BG");
 				return true;
diff --git a/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
index ca3e59b9ae..f2ff7e4577 100755
--- a/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
+++ b/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs
@@ -102,6 +102,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
 			disconnectButton.OnMouseUp = mi =>
 			{
 				Game.Disconnect();
+				Game.LoadShellMap();
 				Widget.CloseWindow();
 				Widget.OpenWindow("MAINMENU_BG");
 				return true;