From 5e2e284cbfd20ad40647a1fc535dff5408e17d6a Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 6 Apr 2013 01:52:16 +1300 Subject: [PATCH] Add map type and author to lobby. --- OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs | 14 ++++++++++++++ mods/cnc/chrome/lobby.yaml | 16 +++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index c235888f40..b5877f9ea5 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -122,6 +122,20 @@ namespace OpenRA.Mods.RA.Widgets.Logic mapTitle.GetText = () => Map.Title; } + var mapType = lobby.GetOrNull("MAP_TYPE"); + if (mapType != null) + { + mapType.IsVisible = () => Map != null; + mapType.GetText = () => Map.Type; + } + + var mapAuthor = lobby.GetOrNull("MAP_AUTHOR"); + if (mapAuthor != null) + { + mapAuthor.IsVisible = () => Map != null; + mapAuthor.GetText = () => "Created by {0}".F(Map.Author); + } + CountryNames = Rules.Info["world"].Traits.WithInterface() .Where(c => c.Selectable) .ToDictionary(a => a.Race, a => a.Name); diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index 14dd29f0c3..d360c6a932 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -34,11 +34,25 @@ Container@SERVER_LOBBY: Height:192 Label@MAP_TITLE: X:PARENT_RIGHT-15-WIDTH - Y:225 + Y:227 Width:194 Height:25 Font:Bold Align:Center + Label@MAP_TYPE: + X:PARENT_RIGHT-15-WIDTH + Y:242 + Width:194 + Height:25 + Font:TinyBold + Align:Center + Label@MAP_AUTHOR: + X:PARENT_RIGHT-15-WIDTH + Y:254 + Width:194 + Height:25 + Font:Tiny + Align:Center ScrollPanel@PLAYERS: X:15 Y:30