From bdcd8097e58ed40ed2fa7430fb384a94e2fdaca2 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 6 Oct 2011 22:13:40 +1300 Subject: [PATCH] start reducing differences between cnc and ra mapchoosers --- OpenRA.Game/Widgets/WidgetUtils.cs | 9 +++++++++ OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs | 9 --------- OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs | 2 +- OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs | 2 +- OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs | 2 +- OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs | 2 +- mods/ra/chrome/map-chooser.yaml | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/OpenRA.Game/Widgets/WidgetUtils.cs b/OpenRA.Game/Widgets/WidgetUtils.cs index 75bc26a637..0605b174c5 100644 --- a/OpenRA.Game/Widgets/WidgetUtils.cs +++ b/OpenRA.Game/Widgets/WidgetUtils.cs @@ -221,6 +221,15 @@ namespace OpenRA.Widgets var mod = Game.modData.Manifest.Mods[0]; return Mod.AllMods[mod].Title; } + + public static string ChooseInitialMap(string map) + { + var availableMaps = Game.modData.AvailableMaps; + if (string.IsNullOrEmpty(map) || !availableMaps.ContainsKey(map)) + return availableMaps.First(m => m.Value.Selectable).Key; + + return map; + } } [Flags] diff --git a/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs b/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs index cecb5c34d8..f48391c5d0 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs @@ -17,15 +17,6 @@ namespace OpenRA.Mods.Cnc.Widgets { public static class CncWidgetUtils { - public static string ChooseInitialMap(string map) - { - var availableMaps = Game.modData.AvailableMaps; - if (string.IsNullOrEmpty(map) || !availableMaps.ContainsKey(map)) - return availableMaps.First(m => m.Value.Selectable).Key; - - return map; - } - public static void PromptConfirmAction(string title, string text, Action onConfirm, Action onCancel) { var prompt = Widget.OpenWindow("CONFIRM_PROMPT"); diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs index cd99793d33..fa300b5fb4 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic [ObjectCreator.Param] Action onExit, [ObjectCreator.Param] Action onSelect) { - map = Game.modData.AvailableMaps[ CncWidgetUtils.ChooseInitialMap(initialMap) ]; + map = Game.modData.AvailableMaps[ WidgetUtils.ChooseInitialMap(initialMap) ]; var panel = widget.GetWidget("MAPCHOOSER_PANEL"); diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs index 81a4363705..2567f6a4c3 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs @@ -143,7 +143,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic void StartSkirmishGame() { - var map = CncWidgetUtils.ChooseInitialMap(Game.Settings.Server.Map); + var map = WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map); CncConnectingLogic.Connect(IPAddress.Loopback.ToString(), Game.CreateLocalServer(map), diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs index c331fd5951..f2bf75e6aa 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs @@ -47,7 +47,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic }); }; - map = Game.modData.AvailableMaps[ CncWidgetUtils.ChooseInitialMap(Game.Settings.Server.Map) ]; + map = Game.modData.AvailableMaps[ WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map) ]; panel.GetWidget("MAP_PREVIEW").Map = () => map; panel.GetWidget("MAP_NAME").GetText = () => map.Title; diff --git a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs index da17154ba1..5492280d71 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic else Map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value; - bg.GetWidget("MAPCHOOSER_MAP_PREVIEW").Map = () => Map; + bg.GetWidget("MAP_PREVIEW").Map = () => Map; bg.GetWidget("CURMAP_TITLE").GetText = () => Map.Title; bg.GetWidget("CURMAP_AUTHOR").GetText = () => Map.Author; bg.GetWidget("CURMAP_DESC").GetText = () => Map.Description; diff --git a/mods/ra/chrome/map-chooser.yaml b/mods/ra/chrome/map-chooser.yaml index aa528751e4..35d42e94d7 100644 --- a/mods/ra/chrome/map-chooser.yaml +++ b/mods/ra/chrome/map-chooser.yaml @@ -78,8 +78,8 @@ Background@MAP_CHOOSER: Height:252 Background:dialog3 Children: - MapPreview@MAPCHOOSER_MAP_PREVIEW: - Id:MAPCHOOSER_MAP_PREVIEW + MapPreview@MAP_PREVIEW: + Id:MAP_PREVIEW X:4 Y:4 Width:244