Merge branch 'master' of bitbucket.org:Regalis11/barotrauma

2016-03-03 20:18:35 +01:00
parent 467a99f79d 35c36d283a
commit f97ff4ca46
111 changed files with 1720 additions and 1204 deletions
--- a/Subsurface/Source/Map/Structure.cs
+++ b/Subsurface/Source/Map/Structure.cs
@@ -142,7 +142,7 @@ namespace Barotrauma
        }
                
        public Structure(Rectangle rectangle, StructurePrefab sp, Submarine submarine)
-            : base(submarine)
+            : base(sp, submarine)
        {
            if (rectangle.Width == 0 || rectangle.Height == 0) return;