[Scummvm-cvs-logs] scummvm master -> 984407de8473731687203675c3bc3dda93e79cbf

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
984407de84 SCUMM: fix SCUMM3 FM-TOWNS font rendering glitch in Japanese mode


Commit: 984407de8473731687203675c3bc3dda93e79cbf
    https://github.com/scummvm/scummvm/commit/984407de8473731687203675c3bc3dda93e79cbf
Author: athrxx (athrxx at scummvm.org)
Date: 2011-06-19T05:47:11-07:00

Commit Message:
SCUMM: fix SCUMM3 FM-TOWNS font rendering glitch in Japanese mode

(Wrong character height for non-SJIS chars which messed up the inventory scrolling arrows)

Changed paths:
    engines/scumm/charset.cpp



diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 9238b25..97caa47 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -789,8 +789,10 @@ void CharsetRendererV3::printChar(int chr, bool ignoreCharsetMask) {
 		else if (_vm->_cjkFont)
 			_vm->_cjkFont->drawChar(_vm->_textSurface, chr, _left * _vm->_textSurfaceMultiplier, _top * _vm->_textSurfaceMultiplier, _color, _shadowColor);
 #endif
-		if (is2byte)
+		if (is2byte) {
 			origWidth /= _vm->_textSurfaceMultiplier;
+			height /= _vm->_textSurfaceMultiplier;
+		}
 	}
 
 	if (_str.left > _left)
@@ -804,8 +806,8 @@ void CharsetRendererV3::printChar(int chr, bool ignoreCharsetMask) {
 			_str.right++;
 	}
 
-	if (_str.bottom < _top + height / _vm->_textSurfaceMultiplier)
-		_str.bottom = _top + height / _vm->_textSurfaceMultiplier;
+	if (_str.bottom < _top + height)
+		_str.bottom = _top + height;
 }
 
 void CharsetRendererV3::drawChar(int chr, Graphics::Surface &s, int x, int y) {