epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start reducing differences between cnc and ra mapchoosers

Browse Source
This commit is contained in:
Chris Forbes
2011-10-06 22:13:40 +13:00
parent dfa456a537
commit bdcd8097e5
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Widgets/WidgetUtils.cs
View File

@@ -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]

9
OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs
View File

@@ -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");

2
OpenRA.Mods.Cnc/Widgets/Logic/CncMapChooserLogic.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
[ObjectCreator.Param] Action onExit,
[ObjectCreator.Param] Action<Map> onSelect)
{
map = Game.modData.AvailableMaps[ CncWidgetUtils.ChooseInitialMap(initialMap) ];
map = Game.modData.AvailableMaps[ WidgetUtils.ChooseInitialMap(initialMap) ];
var panel = widget.GetWidget("MAPCHOOSER_PANEL");

2
OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs
View File

@@ -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),

2
OpenRA.Mods.Cnc/Widgets/Logic/CncServerCreationLogic.cs
View File

@@ -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<MapPreviewWidget>("MAP_PREVIEW").Map = () => map;
panel.GetWidget<LabelWidget>("MAP_NAME").GetText = () => map.Title;

2
OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
else
Map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value;
bg.GetWidget<MapPreviewWidget>("MAPCHOOSER_MAP_PREVIEW").Map = () => Map;
bg.GetWidget<MapPreviewWidget>("MAP_PREVIEW").Map = () => Map;
bg.GetWidget<LabelWidget>("CURMAP_TITLE").GetText = () => Map.Title;
bg.GetWidget<LabelWidget>("CURMAP_AUTHOR").GetText = () => Map.Author;
bg.GetWidget<LabelWidget>("CURMAP_DESC").GetText = () => Map.Description;

4
mods/ra/chrome/map-chooser.yaml
View File

@@ -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