Fixed a bunch of sprites not being removed

2016-02-19 15:58:43 +02:00
parent c59a2b5207
commit 9cfbbb44ed
16 changed files with 68 additions and 30 deletions
--- a/Subsurface/Source/Items/Components/Door.cs
+++ b/Subsurface/Source/Items/Components/Door.cs
@@ -349,16 +349,16 @@ namespace Barotrauma.Items.Components
            UpdateConvexHulls();
        }

-        public override void Remove()
+        protected override void RemoveComponentSpecific()
        {
-            base.Remove();
+            base.RemoveComponentSpecific();

            GameMain.World.RemoveBody(body.FarseerBody);

            if (linkedGap!=null) linkedGap.Remove();

            doorSprite.Remove();
-            weldedSprite.Remove();
+            if (weldedSprite != null) weldedSprite.Remove();

            if (convexHull!=null) convexHull.Remove();
            if (convexHull2 != null) convexHull2.Remove();