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

Remove modRules widget logic argument.

Browse Source
This commit is contained in:
Paul Chote
2016-02-17 02:53:15 +00:00
parent 84b470017f
commit a6c4eb330a
11 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Widgets/WidgetLoader.cs
View File

@@ -46,9 +46,6 @@ namespace OpenRA
public Widget LoadWidget(WidgetArgs args, Widget parent, MiniYamlNode node)
{
if (!args.ContainsKey("modRules"))
args = new WidgetArgs(args) { { "modRules", modData.DefaultRules } };
if (!args.ContainsKey("modData"))
args = new WidgetArgs(args) { { "modData", modData } };

4
OpenRA.Mods.Common/Widgets/ButtonWidget.cs
View File

@@ -60,9 +60,9 @@ namespace OpenRA.Mods.Common.Widgets
protected readonly Ruleset ModRules;
[ObjectCreator.UseCtor]
public ButtonWidget(Ruleset modRules)
public ButtonWidget(ModData modData)
{
ModRules = modRules;
ModRules = modData.DefaultRules;
GetText = () => Text;
GetColor = () => TextColor;

4
OpenRA.Mods.Common/Widgets/CheckboxWidget.cs
View File

@@ -25,8 +25,8 @@ namespace OpenRA.Mods.Common.Widgets
public bool HasPressedState = ChromeMetrics.Get<bool>("CheckboxPressedState");
[ObjectCreator.UseCtor]
public CheckboxWidget(Ruleset modRules)
: base(modRules)
public CheckboxWidget(ModData modData)
: base(modData)
{
GetCheckType = () => CheckType;
}

4
OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs
View File

@@ -29,8 +29,8 @@ namespace OpenRA.Mods.Common.Widgets
public string PanelRoot;
[ObjectCreator.UseCtor]
public DropDownButtonWidget(Ruleset modRules)
: base(modRules) { }
public DropDownButtonWidget(ModData modData)
: base(modData) { }
protected DropDownButtonWidget(DropDownButtonWidget widget)
: base(widget)

4
OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameChatLogic.cs
View File

@@ -39,10 +39,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
bool teamChat;
[ObjectCreator.UseCtor]
public IngameChatLogic(Widget widget, OrderManager orderManager, World world, Ruleset modRules)
public IngameChatLogic(Widget widget, OrderManager orderManager, World world, ModData modData)
{
this.orderManager = orderManager;
this.modRules = modRules;
this.modRules = modData.DefaultRules;
chatTraits = world.WorldActor.TraitsImplementing<INotifyChat>().ToArray();

6
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
[ObjectCreator.UseCtor]
internal LobbyLogic(Widget widget, ModData modData, WorldRenderer worldRenderer, OrderManager orderManager,
Action onExit, Action onStart, bool skirmishMode, Ruleset modRules)
Action onExit, Action onStart, bool skirmishMode)
{
MapPreview = MapCache.UnknownMap;
lobby = widget;
@@ -121,7 +121,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
this.onStart = onStart;
this.onExit = onExit;
this.skirmishMode = skirmishMode;
this.modRules = modRules;
// TODO: This needs to be reworked to support per-map tech levels, bots, etc.
this.modRules = modData.DefaultRules;
shellmapWorld = worldRenderer.World;
orderManager.AddChatLine += AddChatLine;

4
OpenRA.Mods.Common/Widgets/Logic/MusicPlayerLogic.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
MusicInfo currentSong = null;
[ObjectCreator.UseCtor]
public MusicPlayerLogic(Widget widget, ModData modData, Ruleset modRules, World world, Action onExit)
public MusicPlayerLogic(Widget widget, ModData modData, World world, Action onExit)
{
var panel = widget;
@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Game.RunAfterTick(() => Game.InitializeMod("modchooser", new Arguments(args)));
var installData = modData.Manifest.Get<ContentInstaller>();
installButton.IsVisible = () => modRules.InstalledMusic.ToArray().Length <= installData.ShippedSoundtracks;
installButton.IsVisible = () => modData.DefaultRules.InstalledMusic.ToArray().Length <= installData.ShippedSoundtracks;
}
var songWatcher = widget.GetOrNull<LogicTickerWidget>("SONG_WATCHER");

4
OpenRA.Mods.Common/Widgets/MenuButtonWidget.cs
View File

@@ -18,8 +18,8 @@ namespace OpenRA.Mods.Common.Widgets
public readonly bool HideIngameUI = true;
[ObjectCreator.UseCtor]
public MenuButtonWidget(Ruleset modRules)
: base(modRules) { }
public MenuButtonWidget(ModData modData)
: base(modData) { }
protected MenuButtonWidget(MenuButtonWidget other)
: base(other)

4
OpenRA.Mods.Common/Widgets/ProductionTypeButtonWidget.cs
View File

@@ -17,8 +17,8 @@ namespace OpenRA.Mods.Common.Widgets
public readonly string HotkeyName;
[ObjectCreator.UseCtor]
public ProductionTypeButtonWidget(Ruleset modRules)
: base(modRules) { }
public ProductionTypeButtonWidget(ModData modData)
: base(modData) { }
protected ProductionTypeButtonWidget(ProductionTypeButtonWidget other)
: base(other)

4
OpenRA.Mods.Common/Widgets/ScrollItemWidget.cs
View File

@@ -20,8 +20,8 @@ namespace OpenRA.Mods.Common.Widgets
public string BaseName = "scrollitem";
[ObjectCreator.UseCtor]
public ScrollItemWidget(Ruleset modRules)
: base(modRules)
public ScrollItemWidget(ModData modData)
: base(modData)
{
IsVisible = () => false;
VisualHeight = 0;

4
OpenRA.Mods.Common/Widgets/ScrollPanelWidget.cs
View File

@@ -86,9 +86,9 @@ namespace OpenRA.Mods.Common.Widgets
}
[ObjectCreator.UseCtor]
public ScrollPanelWidget(Ruleset modRules)
public ScrollPanelWidget(ModData modData)
{
this.modRules = modRules;
this.modRules = modData.DefaultRules;
Layout = new ListLayout(this);
}