aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorathrxx2011-06-19 14:46:02 +0200
committerathrxx2011-06-19 14:47:11 +0200
commit984407de8473731687203675c3bc3dda93e79cbf (patch)
tree52207d9df1a5bfaeb91a0827d035c577e9448d00 /engines/scumm
parent9f8850fd918b37b7c7d214ffaaec0ae2b5987bd7 (diff)
downloadscummvm-rg350-984407de8473731687203675c3bc3dda93e79cbf.tar.gz
scummvm-rg350-984407de8473731687203675c3bc3dda93e79cbf.tar.bz2
scummvm-rg350-984407de8473731687203675c3bc3dda93e79cbf.zip
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)
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/charset.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 9238b25feb..97caa47d6a 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) {