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

2019-03-29 17:24:17 +02:00
parent ca08b803dc
commit ddfd7274e9
22 changed files with 230 additions and 99 deletions
@@ -10,12 +10,6 @@ namespace Barotrauma

        protected override void ControlInput(Camera cam)
        {
-            if (draggingItem == null && HUD.CloseHUD(BackgroundFrame))
-            {
-                // TODO: fix so that works with the server side
-                Character.Controlled.SelectedConstruction = null;
-                return;
-            }
            base.ControlInput(cam);
            if (BackgroundFrame.Contains(PlayerInput.MousePosition))
            {