[Scummvm-git-logs] scummvm master -> 837b94e83fb07b658379dc1f5c4b5bc72b6bb57f

[wonst719]

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:
837b94e83f SCUMM: Fix cursor with Korean fan translated Loom


Commit: 837b94e83fb07b658379dc1f5c4b5bc72b6bb57f
    https://github.com/scummvm/scummvm/commit/837b94e83fb07b658379dc1f5c4b5bc72b6bb57f
Author: wonst719 (wonst719 at gmail.com)
Date: 2020-11-15T19:25:07+09:00

Commit Message:
SCUMM: Fix cursor with Korean fan translated Loom

- Tested with all known CJK versions of Loom (FMT/Japanese, PCE/Japanese)

Changed paths:
    engines/scumm/cursor.cpp


diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index d7eae60d7b..1eec04bdb0 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -419,6 +419,9 @@ void ScummEngine_v5::redefineBuiltinCursorFromChar(int index, int chr) {
 		Graphics::Surface s;
 		byte buf[16*17];
 		memset(buf, 123, 16*17);
+		// For correct rendering, we need to use original (non-CJK) fonts
+		bool oldCJKMode = _useCJKMode;
+		_useCJKMode = false;
 		s.init(_charset->getCharWidth(chr), _charset->getFontHeight(),
 		       _charset->getCharWidth(chr), buf,
 		       Graphics::PixelFormat::createFormatCLUT8());
@@ -426,6 +429,7 @@ void ScummEngine_v5::redefineBuiltinCursorFromChar(int index, int chr) {
 		assert(s.w <= 16 && s.h <= 17);
 
 		_charset->drawChar(chr, s, 0, 0);
+		_useCJKMode = oldCJKMode;
 
 		memset(ptr, 0, 17 * sizeof(uint16));
 		for (h = 0; h < s.h; h++) {