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

Fix initial selected map, naming.

Browse Source
This commit is contained in:
Paul Chote
2011-05-08 17:26:01 +12:00
parent 7db1b5a1a0
commit 5e32cd38eb
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs
View File

@@ -206,7 +206,7 @@ namespace OpenRA.Mods.Cnc.Widgets
Widget.OpenWindow( "MAPCHOOSER_PANEL", new Dictionary<string, object> Widget.OpenWindow( "MAPCHOOSER_PANEL", new Dictionary<string, object>
{ {
{ "initialMap", Map }, { "initialMap", Map.Uid },
{ "onExit", new Action(() => Widget.CloseWindow()) }, { "onExit", new Action(() => Widget.CloseWindow()) },
{ "onSelect", onSelect } { "onSelect", onSelect }
}); });

42
OpenRA.Mods.Cnc/Widgets/CncMapChooserLogic.cs
View File

@@ -21,33 +21,31 @@ namespace OpenRA.Mods.Cnc.Widgets
{ {
public class CncMapChooserLogic : IWidgetDelegate public class CncMapChooserLogic : IWidgetDelegate
{ {
Map Map = null; Map map = null;
Widget scrollpanel; Widget scrollpanel;
Widget itemTemplate; Widget itemTemplate;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
internal CncMapChooserLogic([ObjectCreator.Param] Widget widget, internal CncMapChooserLogic([ObjectCreator.Param] Widget widget,
[ObjectCreator.Param] Map initialMap, [ObjectCreator.Param] string initialMap,
[ObjectCreator.Param] Action onExit, [ObjectCreator.Param] Action onExit,
[ObjectCreator.Param] Action<Map> onSelect) [ObjectCreator.Param] Action<Map> onSelect)
{ {
if (initialMap != null) if (string.IsNullOrEmpty(initialMap) || ! Game.modData.AvailableMaps.TryGetValue(initialMap, out map))
Map = initialMap; map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value;
else
Map = Game.modData.AvailableMaps.FirstOrDefault(m => m.Value.Selectable).Value;
var panel = widget.GetWidget("MAPCHOOSER_PANEL"); var panel = widget.GetWidget("MAPCHOOSER_PANEL");
panel.GetWidget<MapPreviewWidget>("MAP_PREVIEW").Map = () => Map; panel.GetWidget<MapPreviewWidget>("MAP_PREVIEW").Map = () => map;
panel.GetWidget<LabelWidget>("CURMAP_TITLE").GetText = () => Map.Title; panel.GetWidget<LabelWidget>("CURMAP_TITLE").GetText = () => map.Title;
panel.GetWidget<LabelWidget>("CURMAP_AUTHOR").GetText = () => Map.Author; panel.GetWidget<LabelWidget>("CURMAP_AUTHOR").GetText = () => map.Author;
panel.GetWidget<LabelWidget>("CURMAP_DESC").GetText = () => Map.Description; panel.GetWidget<LabelWidget>("CURMAP_DESC").GetText = () => map.Description;
panel.GetWidget<LabelWidget>("CURMAP_DESC_LABEL").IsVisible = () => Map.Description != null; panel.GetWidget<LabelWidget>("CURMAP_DESC_LABEL").IsVisible = () => map.Description != null;
panel.GetWidget<LabelWidget>("CURMAP_SIZE").GetText = () => "{0}x{1}".F(Map.Bounds.Width, Map.Bounds.Height); panel.GetWidget<LabelWidget>("CURMAP_SIZE").GetText = () => "{0}x{1}".F(map.Bounds.Width, map.Bounds.Height);
panel.GetWidget<LabelWidget>("CURMAP_THEATER").GetText = () => Rules.TileSets[Map.Tileset].Name; panel.GetWidget<LabelWidget>("CURMAP_THEATER").GetText = () => Rules.TileSets[map.Tileset].Name;
panel.GetWidget<LabelWidget>("CURMAP_PLAYERS").GetText = () => Map.PlayerCount.ToString(); panel.GetWidget<LabelWidget>("CURMAP_PLAYERS").GetText = () => map.PlayerCount.ToString();
panel.GetWidget<CncMenuButtonWidget>("BUTTON_OK").OnClick = () => onSelect(Map); panel.GetWidget<CncMenuButtonWidget>("BUTTON_OK").OnClick = () => onSelect(map);
panel.GetWidget<CncMenuButtonWidget>("BUTTON_CANCEL").OnClick = onExit; panel.GetWidget<CncMenuButtonWidget>("BUTTON_CANCEL").OnClick = onExit;
panel.GetWidget<CncMenuButtonWidget>("BUTTON_INSTALL").IsDisabled = () => true; panel.GetWidget<CncMenuButtonWidget>("BUTTON_INSTALL").IsDisabled = () => true;
@@ -63,17 +61,17 @@ namespace OpenRA.Mods.Cnc.Widgets
scrollpanel.RemoveChildren(); scrollpanel.RemoveChildren();
foreach (var kv in Game.modData.AvailableMaps.OrderBy(kv => kv.Value.Title).OrderBy(kv => kv.Value.PlayerCount)) foreach (var kv in Game.modData.AvailableMaps.OrderBy(kv => kv.Value.Title).OrderBy(kv => kv.Value.PlayerCount))
{ {
var map = kv.Value; var m = kv.Value;
if (!map.Selectable) if (!m.Selectable)
continue; continue;
var template = itemTemplate.Clone() as ContainerWidget; var template = itemTemplate.Clone() as ContainerWidget;
template.GetBackground = () => (template.RenderBounds.Contains(Viewport.LastMousePos) ? "button-hover" : (Map == map) ? "button-pressed" : null); template.GetBackground = () => (template.RenderBounds.Contains(Viewport.LastMousePos) ? "button-hover" : (m == map) ? "button-pressed" : null);
template.OnMouseDown = mi => { if (mi.Button != MouseButton.Left) return false; Map = map; return true; }; template.OnMouseDown = mi => { if (mi.Button != MouseButton.Left) return false; map = m; return true; };
template.IsVisible = () => true; template.IsVisible = () => true;
template.GetWidget<LabelWidget>("TITLE").GetText = () => map.Title; template.GetWidget<LabelWidget>("TITLE").GetText = () => m.Title;
template.GetWidget<LabelWidget>("PLAYERS").GetText = () => "{0}".F(map.PlayerCount); template.GetWidget<LabelWidget>("PLAYERS").GetText = () => "{0}".F(m.PlayerCount);
template.GetWidget<LabelWidget>("TYPE").GetText = () => map.Type; template.GetWidget<LabelWidget>("TYPE").GetText = () => m.Type;
scrollpanel.AddChild(template); scrollpanel.AddChild(template);
} }
} }

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

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{ {
Widget.OpenWindow( "MAPCHOOSER_PANEL", new Dictionary<string, object> Widget.OpenWindow( "MAPCHOOSER_PANEL", new Dictionary<string, object>
{ {
{ "initialMap", map }, { "initialMap", map.Uid },
{ "onExit", new Action(() => Widget.CloseWindow()) }, { "onExit", new Action(() => Widget.CloseWindow()) },
{ "onSelect", new Action<Map>(m => { map = m; Widget.CloseWindow(); }) } { "onSelect", new Action<Map>(m => { map = m; Widget.CloseWindow(); }) }
}); });

2
mods/cnc/chrome/createserver.yaml
View File

@@ -142,7 +142,7 @@ Container@CREATESERVER_PANEL:
Y:259 Y:259
Width:140 Width:140
Height:35 Height:35
Text:Change Map Text:Choose Map
CncMenuButton@CREATE_BUTTON: CncMenuButton@CREATE_BUTTON:
Id:CREATE_BUTTON Id:CREATE_BUTTON
X:464 X:464