(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -414,28 +414,6 @@ namespace Barotrauma
            return retVal;
        }

-        public Vector2 MeasureChar(char c)
-        {
-            Vector2 retVal = Vector2.Zero;
-            retVal.Y = baseHeight * 1.8f;
-            if (texCoords.TryGetValue(c, out GlyphData gd))
-            {
-                retVal.X = gd.advance;
-            }
-            return retVal;
-        }
-
-        public Vector2 MeasureChar(char c)
-        {
-            Vector2 retVal = Vector2.Zero;
-            retVal.Y = baseHeight * 1.8f;
-            if (texCoords.TryGetValue(c, out GlyphData gd))
-            {
-                retVal.X = gd.advance;
-            }
-            return retVal;
-        }
-
        public void Dispose()
        {
            FontList.Remove(this);