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

Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs

@@ -334,7 +334,7 @@ namespace Barotrauma
 
                 Font.DrawString(spriteBatch,
                     Wrap ? wrappedText : text,
-                    rect.Location.ToVector2() + textPos + TextOffset,
+                    pos,
                     textColor * (textColor.A / 255.0f),
                     0.0f, origin, TextScale,
                     SpriteEffects.None, textDepth);

Barotrauma/BarotraumaClient/Source/GUI/LoadingScreen.cs

@@ -208,7 +208,7 @@ namespace Barotrauma
                     for (int i = 0; i < lines.Length; i++)
                     {
                         GUI.Font.DrawString(spriteBatch, lines[i],
-                            new Vector2(GameMain.GraphicsWidth / 2.0f - GUI.Font.MeasureString(lines[i]).X / 2.0f, GameMain.GraphicsHeight * 0.78f + i * lineHeight), Color.White);
+                            new Vector2((int)(GameMain.GraphicsWidth / 2.0f - GUI.Font.MeasureString(lines[i]).X / 2.0f), (int)(GameMain.GraphicsHeight * 0.78f + i * lineHeight)), Color.White);
                     }
                 }
 

Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs

@@ -790,6 +790,7 @@ namespace Barotrauma
                 for (int i = legalCrap.Length - 1; i >= 0; i--)
                 {
                     Vector2 textSize = GUI.SmallFont.MeasureString(legalCrap[i]);
+                    textSize = new Vector2((int)textSize.X, (int)textSize.Y);
                     bool mouseOn = i == 0 &&
                         PlayerInput.MousePosition.X > textPos.X - textSize.X && PlayerInput.MousePosition.X < textPos.X &&
                         PlayerInput.MousePosition.Y > textPos.Y - textSize.Y && PlayerInput.MousePosition.Y < textPos.Y;