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
@@ -178,7 +178,7 @@ namespace Barotrauma
        }

        public Hull(MapEntityPrefab prefab, Rectangle rectangle)
-            : this (prefab, rectangle, Submarine.Loaded)
+            : this (prefab, rectangle, Submarine.MainSub)
        {

        }
@@ -821,7 +821,7 @@ namespace Barotrauma
                }
                else
                {
-                    var newFire = new FireSource(pos + Submarine.Loaded.Position, this, true);
+                    var newFire = new FireSource(pos + Submarine.Position, this, true);
                    newFire.Size = new Vector2(
                        newFire.Hull == null ? size : size * newFire.Hull.rect.Width, 
                        newFire.Size.Y);