From b60febe8a81120a21c2346bb8bc4255038b695e8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 23 Oct 2004 23:08:53 +0000
Subject: Patch #1048283 (Improved CJK / FM-TOWNS support & some documention)

svn-id: r15671
---
 scumm/nut_renderer.cpp | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'scumm/nut_renderer.cpp')

diff --git a/scumm/nut_renderer.cpp b/scumm/nut_renderer.cpp
index 859578bb14..1b8c737248 100644
--- a/scumm/nut_renderer.cpp
+++ b/scumm/nut_renderer.cpp
@@ -204,13 +204,8 @@ int NutRenderer::getCharWidth(byte c) const {
 		return 0;
 	}
 
-	if (c >= 0x80 && _vm->_useCJKMode) {
-		if (_vm->_gameId == GID_CMI)
-			return 8;
-		if (_vm->_gameId == GID_DIG)
-			return 6;
-		return 0;
-	}
+	if (c >= 0x80 && _vm->_useCJKMode)
+		return _vm->_2byteWidth / 2;
 
 	if (c >= _numChars)
 		error("invalid character in NutRenderer::getCharWidth : %d (%d)", c, _numChars);
@@ -225,13 +220,8 @@ int NutRenderer::getCharHeight(byte c) const {
 		return 0;
 	}
 
-	if (c >= 0x80 && _vm->_useCJKMode) {
-		if (_vm->_gameId == GID_CMI)
-			return 16;
-		if (_vm->_gameId == GID_DIG)
-			return 10;
-		return 0;
-	}
+	if (c >= 0x80 && _vm->_useCJKMode)
+		return _vm->_2byteHeight;
 
 	if (c >= _numChars)
 		error("invalid character in NutRenderer::getCharHeight : %d (%d)", c, _numChars);
-- 
cgit v1.2.3