First attempt to support Japanese DIG

svn-id: r31456

3 files changed, 4 insertions, 2 deletions

diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index f427594d54..6fadcd171c 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -74,7 +74,7 @@ void ScummEngine::loadCJKFont() {
 			break;
 		case Common::JA_JPN:
 			fontFile = (_game.id == GID_DIG) ? "kanji16.fnt" : "japanese.fnt";
-			numChar = 1024; //FIXME: sev needs japanese font files to clarify font size
+			numChar = 1024;
 			break;
 		case Common::ZH_TWN:
 			if (_game.id == GID_CMI) {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index bc5a208b30..5e7e90e7ef 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1078,7 +1078,7 @@ int ScummEngine::init() {
 		if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 			_system->initSize(Common::kHercW, Common::kHercH);
 			defaultTo1XScaler = true;
-		} else if (_useCJKMode) {
+		} else if (_useCJKMode && _game.id != GID_DIG) {
 			_system->initSize(_screenWidth * _textSurfaceMultiplier, _screenHeight * _textSurfaceMultiplier);
 			defaultTo1XScaler = true;
 		} else {
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index b83a4a3c44..61a960b3ed 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1335,6 +1335,8 @@ void ScummEngine_v7::loadLanguageBundle() {
 				// Don't know what a line with '!' means, just ignore it
 			} else if (*ptr == 'h') {
 				// File contains Korean text (Hangul). just ignore it
+			} else if (*ptr == 'j') {
+				// File contains Japanese text. just ignore it
 			} else if (*ptr == 'e') {
 				// File is encoded!
 				enc = 0x13;