(372c6e60a) More automatic text scaling + merge fix

This commit is contained in:
Joonas Rikkonen
2019-05-06 14:14:30 +03:00
parent 7d825b051c
commit 5af8170ac6
20 changed files with 21 additions and 630 deletions
@@ -562,20 +562,6 @@ namespace Barotrauma
null, connectionColor * MathHelper.Clamp(a, 0.1f, 0.5f), MathUtils.VectorToAngle(end - start),
new Vector2(0, 16), SpriteEffects.None, 0.01f);
}
}
rect.Inflate(8, 8);
GUI.DrawRectangle(spriteBatch, rect, Color.Black, false, 0.0f, 8);
GUI.DrawRectangle(spriteBatch, rect, Color.LightGray);
for (int i = 0; i < Locations.Count; i++)
{
Location location = Locations[i];
Vector2 pos = rectCenter + (location.MapPosition + viewOffset) * zoom;
Rectangle drawRect = location.Type.Sprite.SourceRect;
drawRect.X = (int)pos.X - drawRect.Width / 2;
drawRect.Y = (int)pos.Y - drawRect.Width / 2;
if (GameMain.DebugDraw && zoom > 1.0f && generationParams.ShowLevelTypeNames)
{