From a1d2229a585666076a9c8f502c32e368d44a59e1 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Thu, 25 Apr 2013 12:13:31 +1200
Subject: [PATCH] Remove legacy tooltip code.

---
 OpenRA.Game/Widgets/MapPreviewWidget.cs    | 7 -------
 OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 1 -
 OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs | 9 ---------
 3 files changed, 17 deletions(-)

diff --git a/OpenRA.Game/Widgets/MapPreviewWidget.cs b/OpenRA.Game/Widgets/MapPreviewWidget.cs
index 18ce33f525..3da666e6dc 100644
--- a/OpenRA.Game/Widgets/MapPreviewWidget.cs
+++ b/OpenRA.Game/Widgets/MapPreviewWidget.cs
@@ -24,7 +24,6 @@ namespace OpenRA.Widgets
 		public Func<Map> Map = () => null;
 		public Func<Dictionary<int2, Session.Client>> SpawnClients = () => new Dictionary<int2, Session.Client>();
 		public Action<MouseInput> OnMouseDown = _ => {};
-		public Action<int, int2> OnTooltip = (_, __) => { };
 		public bool IgnoreMouseInput = false;
 		public bool ShowSpawnPoints = true;
 
@@ -147,13 +146,7 @@ namespace OpenRA.Widgets
 					Game.Renderer.RgbaSpriteRenderer.DrawSprite(sprite, pos + offset);
 
 					if ((pos - Viewport.LastMousePos).LengthSquared < 64)
-					{
 						TooltipSpawnIndex = spawnPoints.IndexOf(p) + 1;
-
-						// Legacy tooltip behavior
-						if (TooltipContainer == null)
-							OnTooltip(TooltipSpawnIndex, pos);
-					}
 				}
 			}
 		}
diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
index e1604531f8..44d80257eb 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -112,7 +112,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			mapPreview.IsVisible = () => Map != null;
 			mapPreview.Map = () => Map;
 			mapPreview.OnMouseDown = mi => LobbyUtils.SelectSpawnPoint( orderManager, mapPreview, Map, mi );
-			mapPreview.OnTooltip = (spawnPoint, pos) => LobbyUtils.ShowSpawnPointTooltip(orderManager, spawnPoint, pos);
 			mapPreview.SpawnClients = () => LobbyUtils.GetSpawnClients(orderManager, Map);
 
 			var mapTitle = lobby.GetOrNull<LabelWidget>("MAP_TITLE");
diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
index 8cbf698add..09ba31f0a8 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
@@ -158,15 +158,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			}
 		}
 
-		public static void ShowSpawnPointTooltip(OrderManager orderManager, int spawnPoint, int2 position)
-		{
-			var client = orderManager.LobbyInfo.Clients.FirstOrDefault(c => c.SpawnPoint == spawnPoint);
-			if (client != null)
-			{
-				Game.Renderer.Fonts["Bold"].DrawTextWithContrast(client.Name, position + new int2(5, 5), Color.White, Color.Black, 1);
-			}
-		}
-
 		static Color GetPingColor(Session.Client c)
 		{
 			if (c.Ping < 0) // Ping unknown