v1.4.4.1 (Blood in the Water Update)

This commit is contained in:
Regalis11
2024-04-24 18:09:05 +03:00
parent 89b91d1c3e
commit ff1b8951a7
397 changed files with 15250 additions and 6479 deletions
@@ -135,7 +135,8 @@ namespace Barotrauma
if (subElement.NameAsIdentifier() != "override") { continue; }
if (ScalableFont.ExtractShccFromXElement(subElement).HasFlag(flag))
{
return new ScalableFont(subElement, font?.Size ?? 14, GameMain.Instance.GraphicsDevice);
uint overrideFontSize = GetFontSize(subElement, defaultSize: font?.Size ?? 14);
return new ScalableFont(subElement, overrideFontSize, GameMain.Instance.GraphicsDevice);
}
}
@@ -380,6 +381,11 @@ namespace Barotrauma
public static implicit operator UISprite?(GUISprite reference) => reference.Value;
public void Draw(SpriteBatch spriteBatch, RectangleF rect, Color color, SpriteEffects spriteEffects = SpriteEffects.None)
{
Value?.Draw(spriteBatch, rect, color, spriteEffects);
}
public void Draw(SpriteBatch spriteBatch, Rectangle rect, Color color, SpriteEffects spriteEffects = SpriteEffects.None)
{
Value?.Draw(spriteBatch, rect, color, spriteEffects);