(c1468d39d) Overhauled docking interface (WIP)

Barotrauma/BarotraumaClient/Source/Characters/Character.cs

@@ -46,7 +46,8 @@ namespace Barotrauma
                 if (controlled == value) return;
                 controlled = value;
                 if (controlled != null) controlled.Enabled = true;
-                CharacterHealth.OpenHealthWindow = null;                
+                CharacterHealth.OpenHealthWindow = null;
+                
             }
         }
         
@@ -110,33 +111,6 @@ namespace Barotrauma
             get { return gibEmitters; }
         }
 
-        public class ObjectiveEntity
-        {
-            public Entity Entity;
-            public Sprite Sprite;
-            public Color Color;
-
-            public ObjectiveEntity(Entity entity, Sprite sprite, Color? color = null)
-            {
-                Entity = entity;
-                Sprite = sprite;
-                if (color.HasValue)
-                {
-                    Color = color.Value;
-                }
-                else
-                {
-                    Color = Color.White;
-                }
-            }
-        }
-
-        private List<ObjectiveEntity> activeObjectiveEntities = new List<ObjectiveEntity>();
-        public IEnumerable<ObjectiveEntity> ActiveObjectiveEntities
-        {
-            get { return activeObjectiveEntities; }
-        }
-
         partial void InitProjSpecific(XDocument doc)
         {
             soundInterval = doc.Root.GetAttributeFloat("soundinterval", 10.0f);
@@ -164,6 +138,7 @@ namespace Barotrauma
                         break;
                 }
             }
+        }
 
             hudProgressBars = new Dictionary<object, HUDProgressBar>();
         }
@@ -760,20 +735,6 @@ namespace Barotrauma
             soundTimer = soundInterval;
         }
 
-        public void AddActiveObjectiveEntity(Entity entity, Sprite sprite, Color? color = null)
-        {
-            if (activeObjectiveEntities.Any(aoe => aoe.Entity == entity)) return;
-            ObjectiveEntity objectiveEntity = new ObjectiveEntity(entity, sprite, color);
-            activeObjectiveEntities.Add(objectiveEntity);
-        }
-
-        public void RemoveActiveObjectiveEntity(Entity entity)
-        {
-            ObjectiveEntity found = activeObjectiveEntities.Find(aoe => aoe.Entity == entity);
-            if (found == null) return;
-            activeObjectiveEntities.Remove(found);
-        }
-
         partial void ImplodeFX()
         {
             Vector2 centerOfMass = AnimController.GetCenterOfMass();