Mercurial > repos > IBBoard.WarFoundry.API

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3c4a6403a88c
children 0a2068897793
line wrap: on
line diff
--- a/API/Objects/ArmyCategory.cs	Sat May 28 15:40:05 2011 +0000
+++ b/API/Objects/ArmyCategory.cs	Sat May 28 15:51:54 2011 +0000
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using IBBoard.WarFoundry.API.Requirements;
 
 namespace IBBoard.WarFoundry.API.Objects
 {
@@ -21,7 +20,6 @@
 		private DoubleValChangedDelegate PointsValueChangedMethod;
 		public event ObjectAddDelegate UnitAdded;
 		public event ObjectRemoveDelegate UnitRemoved;
-		public event FailedUnitRequirementDelegate FailedRequirement;
 		public event DoubleValChangedDelegate PointsValueChanged;
 
 		public ArmyCategory(Army army, Category cat) : base()
@@ -67,7 +65,8 @@
 
 		internal void AddUnit(Unit unit)
 		{
-			List<FailedUnitRequirement> failedReqs = ParentArmy.CanAddUnit(unit);
+			//TODO: Put back a similar check
+			//List<FailedUnitRequirement> failedReqs = ParentArmy.CanAddUnit(unit);
 			units.Add(unit);
 			unit.Category = this;
 			unit.PointsValueChanged+= PointsValueChangedMethod;
@@ -75,17 +74,18 @@
 			unitTypes.TryGetValue(unit.UnitType.ID, out unitTypeCount);
 			unitTypes[unit.UnitType.ID] = (int)unitTypeCount + 1;
 			TotalPoints+= unit.Points;
-			OnUnitAdded(unit, failedReqs);
+			OnUnitAdded(unit);
 		}
 
 		internal void RemoveUnit(Unit unit)
 		{
-			List<FailedUnitRequirement> failedReqs = ParentArmy.CanRemoveUnit(unit);
+			//TODO: Put back a similar check
+			//List<FailedUnitRequirement> failedReqs = ParentArmy.CanRemoveUnit(unit);
 			units.Remove(unit);
 			unitTypes[unit.UnitType.ID] = ((int)unitTypes[unit.UnitType.ID])-1;
 			TotalPoints-= unit.Points;
 			unit.PointsValueChanged-= PointsValueChangedMethod;
-			OnUnitRemoved(unit, failedReqs);
+			OnUnitRemoved(unit);
 		}
 
 		public int GetUnitTypeCount(UnitType unitType)
@@ -129,38 +129,18 @@
 
 		protected void OnUnitAdded(Unit unit)
 		{
-			OnUnitAdded(unit, null);
-		}
-
-		protected void OnUnitAdded(Unit unit, List<FailedUnitRequirement> failedReqs)
-		{
 			if (UnitAdded != null)
 			{
 				UnitAdded(unit);
 			}
-
-			if (FailedRequirement != null && failedReqs != null && failedReqs.Count > 0)
-			{
-				FailedRequirement(failedReqs);
-			}
 		}
 
 		protected void OnUnitRemoved(Unit unit)
 		{
-			OnUnitRemoved(unit, null);
-		}
-
-		protected void OnUnitRemoved(Unit unit, List<FailedUnitRequirement> failedReqs)
-		{
 			if (UnitRemoved != null)
 			{
 				UnitRemoved(unit);
 			}
-
-			if (FailedRequirement != null && failedReqs != null && failedReqs.Count > 0)
-			{
-				FailedRequirement(failedReqs);
-			}
 		}
 
 		protected virtual void OnPointsValueChanged(double oldValue, double newValue)