Timestamp:

06/27/09 14:39:04 (14 months ago)

Author:

ibboard

Message:

Re #90: Stop new units showing up twice

• Hand all of unit adding/removing down to category
• Refactor out OnFailedRequirement method in Army
• Make Army listen to and propogate FailedRequirement events from Units
• Add OnUnitAdded/Removed method to ArmyCategory that takes list of failures
• Remove direct reference to Army from Unit and go via ArmyCategory instead

Files:

• IBBoard.WarFoundry.API/trunk/api/Objects/Unit.cs (modified) (4 diffs)

@@ -18 +18 @@
         private UnitType type;
         private int size;
-        private Army army;
         private Unit parentUnit;
         private double points;
@@ -28 +27 @@
         public event DoubleValChangedDelegate UnitEquipmentAmountChanged;
 
-        public Unit(UnitType unitType, Army parentArmy) : this(unitType, unitType.MinSize, parentArmy){}
-
-        public Unit(UnitType unitType, int startSize, Army parentArmy)
-        {
-            Army = parentArmy;
+        public Unit(UnitType unitType, ArmyCategory parentArmyCat) : this(unitType, unitType.MinSize, parentArmyCat) { }
+
+        public Unit(UnitType unitType, int startSize, ArmyCategory parentArmyCat)
+        {
+            Category = parentArmyCat;
             type = unitType;
             Size = startSize;
@@ -144 +143 @@
         public Army Army
         {
-            get { return army; }
-            set 
-            {
-                army = value;
-
-                if (army == null)
-                {
-                    Category = null;
-                }
-            }
+            get { return (Category == null ? null : Category.ParentArmy); }
         }
 
@@ -163 +153 @@
         public ArmyCategory Category
         {
-            get 
-            { 
-                if (cat==null)
-                {
-                    if (Army!=null)
-                    {
-                        return Army.GetCategory(UnitType.MainCategory);
-                    }
-                    else
-                    {
-                        return null;
-                    }
-                }
-                else
-                {
-                    return cat; 
-                }
+            get
+            {
+                return cat;
             }
             set { cat = value; }