Settings menu with sound and music volume sliders, re-enabled deselecting connectionpanels with E in editmapscreen

2015-10-26 19:35:57 +02:00
parent ebe248a7cc
commit 9ed2963cd9
19 changed files with 223 additions and 72 deletions
@@ -105,7 +105,17 @@ namespace Barotrauma.Items.Components
            {
                if (stickTarget != null)
                {
-                    item.body.FarseerBody.RestoreCollisionWith(stickTarget);
+                    try
+                    {
+                        item.body.FarseerBody.RestoreCollisionWith(stickTarget);
+                    }
+                    catch
+                    {
+#if DEBUG
+                        DebugConsole.ThrowError("Failed to restore collision with stickTarget", e);
+#endif
+                    }
+
                    stickTarget = null;
                }
                GameMain.World.RemoveJoint(stickJoint);