Started refactoring the submarine class in order to make it possible to add multiple submarines (or other movable structures)

2016-06-09 18:34:43 +03:00
parent 0e24eab5e3
commit 41569675f3
33 changed files with 151 additions and 117 deletions
@@ -89,7 +89,7 @@ namespace Barotrauma
                }
                else if (target.Submarine == null)
                {
-                    currTargetPos -= Submarine.Loaded.SimPosition;
+                    currTargetPos -= character.Submarine.SimPosition;
                }
            }

@@ -41,7 +41,7 @@ namespace Barotrauma
                if (currentTarget != null)
                {
                    Vector2 pos = character.SimPosition;
-                    if (character != null && character.Submarine == null) pos -= Submarine.Loaded.SimPosition;
+                    if (character != null && character.Submarine == null) pos -= Submarine.MainSub.SimPosition;
                    
                    var path = pathSteering.PathFinder.FindPath(pos, currentTarget.SimPosition);
                    if (path.Cost > 200.0f && character.AnimController.CurrentHull!=null) return;