Merged linux changes, fixed first item in inventory not being loaded, fixed levels breaking if re-entering the same level

2015-11-19 16:29:13 +02:00
parent 118d60342a
commit f42cc78af3
23 changed files with 42 additions and 65 deletions
@@ -582,11 +582,6 @@ namespace Barotrauma
            if (body.LinearVelocity != Vector2.Zero && body.LinearVelocity.Length() > 1000.0f)
            {
                body.ResetDynamics();
-                if (body.SimPosition.Length() > 1000.0f)
-                {
-                    Remove();
-                    return;
-                }
            }
            body.ApplyForce(buoyancy - body.LinearVelocity * volume);