Merge branch 'master' into new-netcode

Conflicts: Subsurface/Properties/AssemblyInfo.cs Subsurface/Source/Items/Components/DockingPort.cs Subsurface/Source/Items/Components/Signal/Wire.cs Subsurface/Source/Items/Item.cs
2016-12-29 22:18:27 +02:00
parent 020aac55ea 12b7290bad
commit 1f07b18e5b
134 changed files with 1799 additions and 683 deletions
@@ -544,11 +544,28 @@ namespace Barotrauma.Items.Components
            RemoveComponentSpecific();
        }

-        protected virtual void RemoveComponentSpecific() 
+        /// <summary>
+        /// Remove the component so that it doesn't appear to exist in the game world (stop sounds, remove bodies etc)
+        /// but don't reset anything that's required for cloning the item
+        /// </summary>
+        public void ShallowRemove()
        {
+            if (loopingSound != null)
+            {
+                Sounds.SoundManager.Stop(loopingSoundIndex);
+            }

+            ShallowRemoveComponentSpecific();
        }

+        protected virtual void ShallowRemoveComponentSpecific()
+        {
+            RemoveComponentSpecific();
+        }
+
+        protected virtual void RemoveComponentSpecific() 
+        { }
+
        public bool HasRequiredSkills(Character character)
        {
            Skill temp;