Merge branch 'master' of https://bitbucket.org/Regalis11/subsurface-private

Conflicts: Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs
2016-01-18 21:48:40 +02:00
parent 1a5b3fa66a 19ec05c70e
commit 9405df006a
7 changed files with 87 additions and 9 deletions
@@ -54,13 +54,6 @@ namespace Barotrauma

            //sort objectives according to priority
            objectives.Sort((x, y) => y.GetPriority(character).CompareTo(x.GetPriority(character)));
-
-            foreach (Gap gap in Gap.GapList)
-            {
-                if (gap.IsRoomToRoom || gap.ConnectedDoor != null || gap.Open<0.01f) continue;
-
-                AddObjective(new AIObjectiveFixLeak(gap, character));
-            }
        }

        public void DoCurrentObjective(float deltaTime)
@@ -87,6 +80,10 @@ namespace Barotrauma
                case "wait":
                    currentObjective = new AIObjectiveGoTo(character, character, true);
                    break;
+                case "fixleaks":
+                case "fix leaks":
+                    currentObjective = new AIObjectiveFixLeaks(character);
+                    break;
                default:
                    if (order.TargetItem == null) return;