Merge ModRuleset and MapRuleset into Ruleset

This commit is contained in:
Pavlos Touboulidis
2014-05-10 10:29:26 +03:00
parent 48d1dde8a7
commit 750fc4e02c
18 changed files with 54 additions and 80 deletions

View File

@@ -55,10 +55,10 @@ namespace OpenRA.Widgets
public Action OnDoubleClick = () => {};
public Action<KeyInput> OnKeyPress = _ => {};
readonly MapRuleset rules;
readonly Ruleset rules;
[ObjectCreator.UseCtor]
public ButtonWidget(MapRuleset rules)
public ButtonWidget(Ruleset rules)
{
this.rules = rules;

View File

@@ -25,7 +25,7 @@ namespace OpenRA.Widgets
public bool HasPressedState = ChromeMetrics.Get<bool>("CheckboxPressedState");
[ObjectCreator.UseCtor]
public CheckboxWidget(MapRuleset rules)
public CheckboxWidget(Ruleset rules)
: base(rules)
{
GetCheckType = () => CheckType;

View File

@@ -22,7 +22,7 @@ namespace OpenRA.Widgets
MaskWidget fullscreenMask;
[ObjectCreator.UseCtor]
public DropDownButtonWidget(MapRuleset rules)
public DropDownButtonWidget(Ruleset rules)
: base(rules) { }
protected DropDownButtonWidget(DropDownButtonWidget widget) : base(widget) { }

View File

@@ -20,7 +20,7 @@ namespace OpenRA.Widgets
public string BaseName = "scrollitem";
[ObjectCreator.UseCtor]
public ScrollItemWidget(MapRuleset rules)
public ScrollItemWidget(Ruleset rules)
: base(rules)
{
IsVisible = () => false;