(44994edc6) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev

2019-05-16 06:21:10 +03:00
parent 48070a3f90
commit fcd95da483
14 changed files with 344 additions and 133 deletions
@@ -34,10 +34,7 @@ namespace Barotrauma
        }

        public AIObjectiveLoop(Character character, AIObjectiveManager objectiveManager, float priorityModifier, string option = null) 
-            : base(character, objectiveManager, priorityModifier, option)
-        {
-            Reset();
-        }
+            : base(character, objectiveManager, priorityModifier, option) { }

        protected override void Act(float deltaTime) { }
        public override bool IsCompleted() => false;
@@ -98,15 +95,6 @@ namespace Barotrauma
            UpdateTargets();
        }

-        public override void OnSelected()
-        {
-            base.OnSelected();
-            if (HumanAIController.ObjectiveManager.CurrentOrder == this)
-            {
-                Reset();
-            }
-        }
-
        public override float GetPriority()
        {
            if (character.Submarine == null) { return 0; }