From 4afd8ad783943fa083fae6a5ca354f4734920fa1 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Wed, 13 Oct 2010 20:45:03 +1300
Subject: [PATCH] #289 lobby title should show servername -- fixed

---
 OpenRA.Game/Network/Session.cs                 | 1 +
 OpenRA.Game/Server/Server.cs                   | 1 +
 OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs | 3 +++
 mods/cnc/chrome/gamelobby.yaml                 | 3 ++-
 mods/ra/chrome/gamelobby.yaml                  | 3 ++-
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Game/Network/Session.cs b/OpenRA.Game/Network/Session.cs
index cf70100ea0..111531e7c7 100644
--- a/OpenRA.Game/Network/Session.cs
+++ b/OpenRA.Game/Network/Session.cs
@@ -62,6 +62,7 @@ namespace OpenRA.Network
 
 		public class Global
 		{
+			public string ServerName;
 			public string Map;
 			public string[] Mods = { "ra" };	// mod names
 			public int OrderLatency = 3;
diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs
index dd27e63664..8a51d6badd 100644
--- a/OpenRA.Game/Server/Server.cs
+++ b/OpenRA.Game/Server/Server.cs
@@ -64,6 +64,7 @@ namespace OpenRA.Server
 			lobbyInfo.GlobalSettings.RandomSeed = randomSeed;
 			lobbyInfo.GlobalSettings.Map = map;
 			lobbyInfo.GlobalSettings.AllowCheats = settings.Server.AllowCheats;
+			lobbyInfo.GlobalSettings.ServerName = settings.Server.Name;
 			
 			LoadMap();	// populates the Session's slots, too.
 			
diff --git a/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs b/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
index 28904b554a..7b668bad2b 100755
--- a/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
+++ b/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
@@ -180,6 +180,9 @@ namespace OpenRA.Widgets.Delegates
 			if (MapUid == orderManager.LobbyInfo.GlobalSettings.Map) return;
 			MapUid = orderManager.LobbyInfo.GlobalSettings.Map;
 			Map = Game.modData.AvailableMaps[MapUid];
+
+			var title = Widget.RootWidget.GetWidget<LabelWidget>("LOBBY_TITLE");
+			title.Text = "OpenRA Multiplayer Lobby - " + orderManager.LobbyInfo.GlobalSettings.ServerName;
 		}
 
 		bool hasJoined = false;
diff --git a/mods/cnc/chrome/gamelobby.yaml b/mods/cnc/chrome/gamelobby.yaml
index 397fcdfa5f..09c4b1d35a 100644
--- a/mods/cnc/chrome/gamelobby.yaml
+++ b/mods/cnc/chrome/gamelobby.yaml
@@ -7,6 +7,7 @@ Background@SERVER_LOBBY:
 	Height:600
 	Children:
 		Label@LOBBY_TITLE:
+			Id:LOBBY_TITLE
 			X:0
 			Y:20
 			Align:Center
@@ -16,7 +17,7 @@ Background@SERVER_LOBBY:
 			Text:OpenRA Multiplayer Lobby
 		Background@LOBBY_MAP_BG:
 			X:PARENT_RIGHT-268
-			Y:39
+			Y:50
 			Width:252
 			Height:252
 			Background:dialog3
diff --git a/mods/ra/chrome/gamelobby.yaml b/mods/ra/chrome/gamelobby.yaml
index 09f8d0f86d..9621d82735 100644
--- a/mods/ra/chrome/gamelobby.yaml
+++ b/mods/ra/chrome/gamelobby.yaml
@@ -8,6 +8,7 @@ Background@SERVER_LOBBY:
 	Visible:true
 	Children:
 		Label@LOBBY_TITLE:
+			Id:LOBBY_TITLE
 			X:0
 			Y:20
 			Align:Center
@@ -17,7 +18,7 @@ Background@SERVER_LOBBY:
 			Text:OpenRA Multiplayer Lobby
 		Background@LOBBY_MAP_BG:
 			X:PARENT_RIGHT-268
-			Y:39
+			Y:50
 			Width:252
 			Height:252
 			Background:dialog3