[Scummvm-git-logs] scummvm master -> 9a54c220c4112bbfac72912f636460462285a6dd

[sev-]

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:
9a54c220c4 SCUMM: Enable basic Korean fan translation


Commit: 9a54c220c4112bbfac72912f636460462285a6dd
    https://github.com/scummvm/scummvm/commit/9a54c220c4112bbfac72912f636460462285a6dd
Author: wonst719 (wonst719 at gmail.com)
Date: 2020-11-06T19:26:50+01:00

Commit Message:
SCUMM: Enable basic Korean fan translation

Changed paths:
    engines/scumm/charset.cpp
    engines/scumm/string.cpp


diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 1f9c5759de..3acfbb3154 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -82,7 +82,8 @@ void ScummEngine::loadCJKFont() {
 		_2byteFontPtr = new byte[_2byteWidth * _2byteHeight * numChar / 8];
 		// set byte 0 to 0xFF (0x00 when loaded) to indicate that the font was not loaded
 		_2byteFontPtr[0] = 0xFF;
-	} else if ((_game.version >= 7 && (_language == Common::KO_KOR || _language == Common::JA_JPN || _language == Common::ZH_TWN)) ||
+	} else if (_language == Common::KO_KOR ||
+			   (_game.version >= 7 && (_language == Common::JA_JPN || _language == Common::ZH_TWN)) ||
 			   (_game.version >= 3 && _language == Common::ZH_CNA)) {
 		int numChar = 0;
 		const char *fontFile = NULL;
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index a92867aa4e..322731e800 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -771,7 +771,7 @@ void ScummEngine::CHARSET_1() {
 #endif
 		} else {
 			if (c & 0x80 && _useCJKMode) {
-				if (checkSJISCode(c)) {
+				if (is2ByteCharacter(_language, c)) {
 					byte *buffer = _charsetBuffer + _charsetBufPos;
 					c += *buffer++ * 256; //LE
 					_charsetBufPos = buffer - _charsetBuffer;
@@ -1182,7 +1182,7 @@ void ScummEngine::drawString(int a, const byte *msg) {
 				}
 			}
 			if (c & 0x80 && _useCJKMode) {
-				if (checkSJISCode(c))
+				if (is2ByteCharacter(_language, c))
 					c += buf[i++] * 256;
 			}
 			_charset->printChar(c, true);