Merge ModRuleset and MapRuleset into Ruleset

2014-05-10 10:29:26 +03:00
parent 48d1dde8a7
commit 750fc4e02c
18 changed files with 54 additions and 80 deletions
--- a/OpenRA.Game/Widgets/ButtonWidget.cs
+++ b/OpenRA.Game/Widgets/ButtonWidget.cs
@@ -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;