diff --git a/Engine/source/gfx/gFont.cpp b/Engine/source/gfx/gFont.cpp index 4155b3492e..53851ba52c 100644 --- a/Engine/source/gfx/gFont.cpp +++ b/Engine/source/gfx/gFont.cpp @@ -933,8 +933,6 @@ bool GFont::read(Stream& io_rStream) io_rStream.read(&ci.bitmapIndex); io_rStream.read(&ci.xOffset); io_rStream.read(&ci.yOffset); - io_rStream.read(&ci.texWidth); - io_rStream.read(&ci.texHeight); io_rStream.read(&ci.width); io_rStream.read(&ci.height); io_rStream.read(&ci.xOrigin); @@ -1003,8 +1001,6 @@ bool GFont::write(Stream& stream) stream.write(ci.bitmapIndex); stream.write(ci.xOffset); stream.write(ci.yOffset); - stream.write(ci.texWidth); - stream.write(ci.texHeight); stream.write(ci.width); stream.write(ci.height); stream.write(ci.xOrigin); diff --git a/Engine/source/gfx/gfxFontRenderBatcher.cpp b/Engine/source/gfx/gfxFontRenderBatcher.cpp index 69523f6b70..cad8326aa7 100644 --- a/Engine/source/gfx/gfxFontRenderBatcher.cpp +++ b/Engine/source/gfx/gfxFontRenderBatcher.cpp @@ -101,7 +101,7 @@ void FontRenderBatcher::render( F32 rot, const Point2F &offset ) const PlatformFont::CharInfo &ci = mFont->getCharInfo( m.c ); // Where are we drawing it? - F32 drawY = offset.y + (mFont->getBaseline()) - (ci.yOrigin) - (mFont->getDescent()); + F32 drawY = offset.y + mFont->getBaseline() - ci.yOrigin * TEXT_MAG; F32 drawX = offset.x + m.x + ci.xOrigin; // Figure some values. diff --git a/Engine/source/platform/platformFont.h b/Engine/source/platform/platformFont.h index 5f35e05043..63a47d95a5 100644 --- a/Engine/source/platform/platformFont.h +++ b/Engine/source/platform/platformFont.h @@ -65,8 +65,6 @@ class PlatformFont /// rendered, i.e., \n, \r, etc. U32 xOffset; ///< x offset into bitmap sheet U32 yOffset; ///< y offset into bitmap sheet - U32 texWidth; - U32 texHeight; U32 width; ///< width of character (pixels) U32 height; ///< height of character (pixels) S32 xOrigin;