This commit is contained in:
Regalis
2016-11-04 16:27:53 +02:00
parent 1e61e815b8
commit a32198ff80
5 changed files with 64 additions and 4 deletions
@@ -1094,7 +1094,11 @@ namespace Barotrauma
}
else
{
collider.CorrectPosition(character.MemPos, deltaTime, out overrideTargetMovement);
if (character.MemPos.Count > 0)
{
collider.LinearVelocity = Vector2.Zero;
collider.CorrectPosition(character.MemPos, deltaTime, out overrideTargetMovement);
}
}
}
@@ -2102,6 +2102,8 @@ namespace Barotrauma
else
{
cursorPosition = Position + new Vector2(1000.0f, 0.0f) * dir;
AnimController.TargetDir = dir < 0 ? Direction.Left : Direction.Right;
}
int index = 0;
+1 -1
View File
@@ -211,7 +211,7 @@ namespace Barotrauma
: base(sp, submarine)
{
if (rectangle.Width == 0 || rectangle.Height == 0) return;
System.Diagnostics.Debug.Assert(rect.Width > 0 && rect.Height > 0);
System.Diagnostics.Debug.Assert(rectangle.Width > 0 && rectangle.Height > 0);
rect = rectangle;
prefab = sp;