WINTERMUTE: Use the correct DPI for TTF-fonts, and don't display overshooting lines.

1 files changed, 8 insertions, 1 deletions

diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 00b522c826..4fa5ac08ce 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -248,6 +248,13 @@ BaseSurface *BaseFontTT::renderTextToTexture(const WideString &text, int width,
 	Common::Array<Common::String> lines;

 	_font->wordWrapText(text, width, lines);

 

+	while (maxHeight > 0 && lines.size() * _lineHeight > maxHeight) {

+		lines.pop_back();

+	}

+	if (lines.size() == 0) {

+		return NULL;

+	}

+

 	Graphics::TextAlign alignment = Graphics::kTextAlignInvalid;

 	if (align == TAL_LEFT) {

 		alignment = Graphics::kTextAlignLeft;

@@ -553,7 +560,7 @@ bool BaseFontTT::initFont() {
 

 	if (file) {

 #ifdef USE_FREETYPE2

-		_deletableFont = Graphics::loadTTFFont(*file, _fontHeight * 4 / 3); // Compensate for the difference in dpi (96 vs 72).

+		_deletableFont = Graphics::loadTTFFont(*file, 96, _fontHeight); // Use the same dpi as WME (96 vs 72).

 		_font = _deletableFont;

 #endif

 	}