(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
@@ -224,6 +224,13 @@ namespace Barotrauma
                    }
                }

+                if (SelectedConstruction != null && SelectedConstruction.ActiveHUDs.Any(ic => ic.GuiFrame != null && HUD.CloseHUD(ic.GuiFrame.Rect)))
+                {
+                    //emulate a Select input to get the character to deselect the item server-side
+                    keys[(int)InputType.Select].Hit = true;
+                    SelectedConstruction = null;
+                }
+
                DoInteractionUpdate(deltaTime, mouseSimPos);
            }