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/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -124,6 +124,8 @@ namespace Barotrauma
            }
            set 
            {
+                if (info != null && info != value) info.Remove();
+
                info = value;
                if (info != null) info.Character = this;
            }
@@ -1685,6 +1687,8 @@ namespace Barotrauma
        {
            base.Remove();

+            if (info != null) info.Remove();
+
            CharacterList.Remove(this);

            if (controlled == this) controlled = null;