From cfb4b08efcb0c608eca19fccda15f8e24a1cb2f0 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 21 Jul 2007 22:57:21 +0000
Subject: Proper height for Chinese characters, also remove obsolete hack for
 computing character base.

svn-id: r28160
---
 engines/scumm/charset.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index df609eec75..7d115d4c4b 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -82,7 +82,7 @@ void ScummEngine::loadCJKFont() {
 		case Common::ZH_TWN:
 			if (_game.id == GID_CMI) {
 				fontFile = "chinese.fnt";
-				numChar = 12779;
+				numChar = 13630;
 			}
 			break;
 		default:
@@ -105,7 +105,7 @@ void ScummEngine::loadCJKFont() {
 				break;
 			case Common::ZH_TWN:
 				_2byteWidth = 16;
-				_2byteHeight = 16;
+				_2byteHeight = 15;
 				// 0xFE -> 0x21. also compared with 0x0d. perhaps a newline
 				break;
 			default:
@@ -244,11 +244,11 @@ byte *ScummEngine::get2byteCharPtr(int idx) {
 						high -= 0x62;
 					}
 
-					base += (low * 157 + high) * 30;
+					base += (low * 0x9d + high) * 30;
 				}
 			}
 
-			return _2byteFontPtr + base - 2;
+			return _2byteFontPtr + base;
 			break;
 		}
 	default:
-- 
cgit v1.2.3