diff API/Objects/Army.cs @ 367:1a70ca80ef41

Re #27: Define unit requirements * Remove remaining references to old Requirements namespace
author IBBoard <dev@ibboard.co.uk>
date Sat, 28 May 2011 15:51:54 +0000
parents 4993e6f7c509
children 3f297a60db1e
line wrap: on
line diff
--- a/API/Objects/Army.cs	Sat May 28 15:40:05 2011 +0000
+++ b/API/Objects/Army.cs	Sat May 28 15:51:54 2011 +0000
@@ -27,7 +27,6 @@
 
 		public event ObjectAddDelegate UnitAdded;
 		public event ObjectRemoveDelegate UnitRemoved;
-		public event FailedUnitRequirementDelegate FailedRequirement;
 		public event DoubleValChangedDelegate PointsValueChanged;
 		private DoubleValChangedDelegate PointsValueChangedMethod;
 		
@@ -69,7 +68,6 @@
 						cat.PointsValueChanged+= PointsValueChangedMethod;
 						cat.UnitAdded+=new ObjectAddDelegate(Army_UnitAdded);
 						cat.UnitRemoved+=new ObjectRemoveDelegate(Army_UnitRemoved);
-						cat.FailedRequirement+=new FailedUnitRequirementDelegate(Army_FailedRequirement);
 					}
 				}
 				
@@ -97,40 +95,18 @@
 
 		protected void OnUnitAdded(Unit unit)
 		{
-			OnUnitAdded(unit, null);
-		}
-
-		protected void OnUnitAdded(Unit unit, List<FailedUnitRequirement> failedReqs)
-		{
 			if (UnitAdded != null)
 			{
 				UnitAdded(unit);
 			}
-
-			OnFailedRequirement(failedReqs);
 		}
 
 		protected void OnUnitRemoved(Unit unit)
 		{
-			OnUnitRemoved(unit, null);
-		}
-
-		protected void OnUnitRemoved(Unit unit, List<FailedUnitRequirement> failedReqs)
-		{
 			if (UnitRemoved!=null)
 			{
 				UnitRemoved(unit);
 			}
-
-			OnFailedRequirement(failedReqs);
-		}
-
-		protected void OnFailedRequirement(List<FailedUnitRequirement> failedReqs)
-		{
-			if (FailedRequirement != null && failedReqs != null && failedReqs.Count > 0)
-			{
-				FailedRequirement(failedReqs);
-			}
 		}
 
 		private void OnPointsValueChanged(double oldValue, double newValue)
@@ -227,30 +203,6 @@
 			}
 		}
 
-		[Obsolete]
-		public List<FailedUnitRequirement> CanAddUnit(Unit unit)
-		{
-			return CanAddUnitType(unit.UnitType);
-		}
-
-		[Obsolete]
-		public List<FailedUnitRequirement> CanAddUnitType(UnitType unitType)
-		{
-			return unitType.CanAddToArmy(this);
-		}
-
-		[Obsolete]
-		public List<FailedUnitRequirement> CanRemoveUnit(Unit unit)
-		{
-			return CanRemoveUnitType(unit.UnitType);
-		}
-
-		[Obsolete]
-		public List<FailedUnitRequirement> CanRemoveUnitType(UnitType unitType)
-		{
-			return unitType.CanRemoveFromArmy(this);
-		}
-
 		public int GetUnitTypeCount(UnitType unitType)
 		{
 			int count = 0;
@@ -273,11 +225,6 @@
 			OnUnitRemoved((Unit)val);
 		}
 
-		private void Army_FailedRequirement(List<FailedUnitRequirement> val)
-		{
-			OnFailedRequirement(val);
-		}
-
 		public ICollection<IRequirement> GetRequirements ()
 		{
 			return Race.GetRequirements();