(4ca668169) Fixed: Conflict

2019-05-16 05:58:48 +03:00
parent 0a67590572
commit cb83984e80
80 changed files with 2036 additions and 1859 deletions
@@ -92,6 +92,7 @@ namespace Barotrauma

                    if (!string.IsNullOrEmpty(uiLabel) && !subInventory)
                    {
+                        uiLabel = ToolBox.WrapText(uiLabel, BackgroundFrame.Width, GUI.Font, 1);
                        GUI.DrawString(spriteBatch,
                            new Vector2((int)(BackgroundFrame.Center.X - GUI.Font.MeasureString(uiLabel).X / 2), (int)BackgroundFrame.Y + 5),
                            uiLabel, Color.White * 0.9f);