From 031e0167e4979fcb9f5bef3fde273605d3dc8eb9 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Fri, 22 Oct 2010 19:28:12 +0000
Subject: SCUMM/FM-TOWNS JAPANESE: fix another font spacing issue

(fixes MI1 character talk text)

svn-id: r53704
---
 engines/scumm/charset.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index db17ecd472..7de424d291 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -394,8 +394,8 @@ int CharsetRendererClassic::getCharWidth(uint16 chr) {
 			if (spacing) {
 				if (_vm->_game.id == GID_MONKEY) {
 					spacing++;
-					//if (_curId == 2)
-					//	spacing++;
+					if (_curId == 2)
+						spacing++;
 				} else if (_vm->_game.id != GID_INDY4 && _curId == 1) {
 					spacing++;
 				}
@@ -910,7 +910,15 @@ void CharsetRendererClassic::printChar(int chr, bool ignoreCharsetMask) {
 		charPtr = 0;
 		_vm->_cjkChar = chr;
 		enableShadow(true);
-		origWidth = width = getCharWidth(chr);
+		
+		width = getCharWidth(chr);
+		// For whatever reason MI1 uses a different font width
+		// for alignment calculation and for drawing when
+		// charset 2 is active. This fixes some subtle glitches.
+		if (_vm->_game.id == GID_MONKEY && _curId == 2)
+			width--;
+		origWidth = width;
+
 		origHeight = height = getFontHeight();
 		offsX = offsY = 0;
 	} else
-- 
cgit v1.2.3