(ecda2cb2a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-04-02 12:41:32 +03:00
parent e86d86c41f
commit 5cf66d7343
5 changed files with 17 additions and 16 deletions
@@ -11,19 +11,16 @@ namespace Barotrauma
protected override void ControlInput(Camera cam)
{
base.ControlInput(cam);
if (BackgroundFrame.Contains(PlayerInput.MousePosition))
cam.OffsetAmount = 0;
//if this is used, we need to implement syncing this inventory with the server
/*Character.DisableControls = true;
if (Character.Controlled != null)
{
cam.OffsetAmount = 0;
//if this is used, we need to implement syncing this inventory with the server
/*Character.DisableControls = true;
if (Character.Controlled != null)
if (PlayerInput.KeyHit(InputType.Select))
{
if (PlayerInput.KeyHit(InputType.Select))
{
Character.Controlled.SelectedConstruction = null;
}
}*/
}
Character.Controlled.SelectedConstruction = null;
}
}*/
}
protected override void CalculateBackgroundFrame()