Unstable v0.9.707.0

This commit is contained in:
Juan Pablo Arce
2020-02-11 16:07:21 -03:00
parent 8324d20464
commit 2783125162
68 changed files with 1460 additions and 1219 deletions
@@ -49,11 +49,11 @@ namespace Barotrauma
{
if (!forceColor)
{
if (!body.Enabled)
if (!FarseerBody.Enabled)
{
color = Color.Black;
}
else if (!body.Awake)
else if (!FarseerBody.Awake)
{
color = Color.Blue;
}
@@ -71,7 +71,7 @@ namespace Barotrauma
if (drawOffset != Vector2.Zero)
{
Vector2 pos = ConvertUnits.ToDisplayUnits(body.Position);
Vector2 pos = ConvertUnits.ToDisplayUnits(FarseerBody.Position);
if (Submarine != null) pos += Submarine.DrawPosition;
GUI.DrawLine(spriteBatch,
@@ -160,7 +160,7 @@ namespace Barotrauma
Vector2 newPosition = SimPosition;
float? newRotation = null;
bool awake = body.Awake;
bool awake = FarseerBody.Awake;
Vector2 newVelocity = LinearVelocity;
float? newAngularVelocity = null;