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

remove duplicate ShowRaceDropDown

Browse Source
This commit is contained in:
Chris Forbes
2011-10-06 22:54:08 +13:00
parent 8f560d79fd
commit c76ebe51a5
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
View File

@@ -298,23 +298,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
} }
} }
void ShowRaceDropDown(DropDownButtonWidget dropdown, Session.Client client)
{
Func<string, ScrollItemWidget, ScrollItemWidget> setupItem = (race, itemTemplate) =>
{
var item = ScrollItemWidget.Setup(itemTemplate,
() => client.Country == race,
() => orderManager.IssueOrder(Order.Command("race {0} {1}".F(client.Index, race))));
item.GetWidget<LabelWidget>("LABEL").GetText = () => CountryNames[race];
var flag = item.GetWidget<ImageWidget>("FLAG");
flag.GetImageCollection = () => "flags";
flag.GetImageName = () => race;
return item;
};
dropdown.ShowDropDown("RACE_DROPDOWN_TEMPLATE", 150, CountryNames.Keys.ToList(), setupItem);
}
void ShowSpawnDropDown(DropDownButtonWidget dropdown, Session.Client client) void ShowSpawnDropDown(DropDownButtonWidget dropdown, Session.Client client)
{ {
Func<int, ScrollItemWidget, ScrollItemWidget> setupItem = (ii, itemTemplate) => Func<int, ScrollItemWidget, ScrollItemWidget> setupItem = (ii, itemTemplate) =>
@@ -434,7 +417,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
var faction = template.GetWidget<DropDownButtonWidget>("FACTION"); var faction = template.GetWidget<DropDownButtonWidget>("FACTION");
faction.IsDisabled = () => slot.LockRace || ready; faction.IsDisabled = () => slot.LockRace || ready;
faction.OnMouseDown = _ => ShowRaceDropDown(faction, client); faction.OnMouseDown = _ => LobbyUtils.ShowRaceDropDown(faction, client, orderManager, CountryNames);
var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME"); var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME");
factionname.GetText = () => CountryNames[client.Country]; factionname.GetText = () => CountryNames[client.Country];

37
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -207,23 +207,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
title.Text = "OpenRA Multiplayer Lobby - " + orderManager.LobbyInfo.GlobalSettings.ServerName; title.Text = "OpenRA Multiplayer Lobby - " + orderManager.LobbyInfo.GlobalSettings.ServerName;
} }
void ShowRaceDropDown(DropDownButtonWidget dropdown, Session.Client client)
{
Func<string, ScrollItemWidget, ScrollItemWidget> setupItem = (race, itemTemplate) =>
{
var item = ScrollItemWidget.Setup(itemTemplate,
() => client.Country == race,
() => orderManager.IssueOrder(Order.Command("race {0} {1}".F(client.Index, race))));
item.GetWidget<LabelWidget>("LABEL").GetText = () => CountryNames[race];
var flag = item.GetWidget<ImageWidget>("FLAG");
flag.GetImageCollection = () => "flags";
flag.GetImageName = () => race;
return item;
};
dropdown.ShowDropDown("RACE_DROPDOWN_TEMPLATE", 150, CountryNames.Keys.ToList(), setupItem);
}
void ShowColorDropDown(DropDownButtonWidget color, Session.Client client) void ShowColorDropDown(DropDownButtonWidget color, Session.Client client)
{ {
var colorChooser = Game.modData.WidgetLoader.LoadWidget( new WidgetArgs() { {"worldRenderer", worldRenderer} }, null, "COLOR_CHOOSER" ); var colorChooser = Game.modData.WidgetLoader.LoadWidget( new WidgetArgs() { {"worldRenderer", worldRenderer} }, null, "COLOR_CHOOSER" );
@@ -308,7 +291,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var faction = template.GetWidget<DropDownButtonWidget>("FACTION"); var faction = template.GetWidget<DropDownButtonWidget>("FACTION");
faction.IsDisabled = () => s.LockRace; faction.IsDisabled = () => s.LockRace;
faction.OnMouseDown = _ => ShowRaceDropDown(faction, c); faction.OnMouseDown = _ => LobbyUtils.ShowRaceDropDown(faction, c, orderManager, CountryNames);
var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME"); var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME");
factionname.GetText = () => CountryNames[c.Country]; factionname.GetText = () => CountryNames[c.Country];
@@ -500,5 +483,23 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var options = Graphics.Util.MakeArray(map.SpawnPoints.Count() + 1, i => i).ToList(); var options = Graphics.Util.MakeArray(map.SpawnPoints.Count() + 1, i => i).ToList();
dropdown.ShowDropDown("TEAM_DROPDOWN_TEMPLATE", 150, options, setupItem); dropdown.ShowDropDown("TEAM_DROPDOWN_TEMPLATE", 150, options, setupItem);
} }
public static void ShowRaceDropDown(DropDownButtonWidget dropdown, Session.Client client,
OrderManager orderManager, Dictionary<string, string> countryNames)
{
Func<string, ScrollItemWidget, ScrollItemWidget> setupItem = (race, itemTemplate) =>
{
var item = ScrollItemWidget.Setup(itemTemplate,
() => client.Country == race,
() => orderManager.IssueOrder(Order.Command("race {0} {1}".F(client.Index, race))));
item.GetWidget<LabelWidget>("LABEL").GetText = () => countryNames[race];
var flag = item.GetWidget<ImageWidget>("FLAG");
flag.GetImageCollection = () => "flags";
flag.GetImageName = () => race;
return item;
};
dropdown.ShowDropDown("RACE_DROPDOWN_TEMPLATE", 150, countryNames.Keys.ToList(), setupItem);
}
} }
} }