Revert "Characters that are outside are rendered under particles -> creatures can be hidden by smoke from hydrothermal vents. [65211ec]"

Caused characters to be rendered behind ruins, need to come up with a better solution
This commit is contained in:
Joonas Rikkonen
2017-08-27 14:28:21 +03:00
parent 37a5888126
commit 79f7ce7071
3 changed files with 12 additions and 50 deletions
@@ -151,14 +151,12 @@ namespace Barotrauma
public Rectangle Borders
{
get { return subBody.Borders; }
get
{
return subBody.Borders;
}
}
public Rectangle WorldBorders
{
get { return SubBody.WorldBorders; }
}
public override Vector2 Position
{
get { return subBody==null ? Vector2.Zero : subBody.Position - HiddenSubPosition; }
@@ -39,12 +39,6 @@ namespace Barotrauma
get;
private set;
}
public Rectangle WorldBorders
{
get;
private set;
}
public Vector2 Velocity
{
@@ -187,10 +181,6 @@ namespace Barotrauma
public void Update(float deltaTime)
{
var worldBorders = Borders;
worldBorders.Location += MathUtils.ToPoint(Position);
WorldBorders = worldBorders;
if (GameMain.Client != null)
{
if (memPos.Count == 0) return;
@@ -242,6 +232,9 @@ namespace Barotrauma
//if outside left or right edge of the level
if (Position.X < 0 || Position.X > Level.Loaded.Size.X)
{
Rectangle worldBorders = Borders;
worldBorders.Location += MathUtils.ToPoint(Position);
//push the sub back below the upper "barrier" of the level
if (worldBorders.Y > Level.Loaded.Size.Y)
{