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

2016-03-03 21:18:53 +02:00
parent 40714c1102 f97ff4ca46
commit b4ff867607
8 changed files with 151 additions and 68 deletions
@@ -213,7 +213,7 @@ namespace Barotrauma.Items.Components

            if (convexHull == null) return;

-            if (rect.Height == 0)
+            if (rect.Height == 0 || rect.Width == 0)
            {
                convexHull.Enabled = false;
            }
@@ -642,7 +642,7 @@ namespace Barotrauma
                body.ResetDynamics();
            }
            body.ApplyForce(buoyancy - body.LinearVelocity * volume);
-                
+            CurrentHull.HandleItems(deltaTime, this);
            //apply simple angular drag
            body.ApplyTorque(body.AngularVelocity * volume * -0.05f);
        }