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

2019-04-04 11:09:45 +03:00
parent 1966bcb4ab
commit 41da4e24a9
17 changed files with 590 additions and 71 deletions
@@ -615,6 +615,9 @@ namespace Barotrauma
            if (GameMain.GameSession?.CrewManager != null)
            {
                disallowedAreas.Add(GameMain.GameSession.CrewManager.GetCharacterListArea());
+                disallowedAreas.Add(new Rectangle(
+                    HUDLayoutSettings.ChatBoxArea.X - 50, HUDLayoutSettings.ChatBoxArea.Y, 
+                    HUDLayoutSettings.ChatBoxArea.Width + 50, HUDLayoutSettings.ChatBoxArea.Height));                
            }

            GUI.PreventElementOverlap(elementsToMove, disallowedAreas,