[Scummvm-git-logs] scummvm master -> 775809791814dae8c2ac05ac107c7130e412a40f

[AndywinXp]

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:
7758097918 SCUMM: Fix Japanese strings handling for all platforms


Commit: 775809791814dae8c2ac05ac107c7130e412a40f
    https://github.com/scummvm/scummvm/commit/775809791814dae8c2ac05ac107c7130e412a40f
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-11-11T21:35:43+01:00

Commit Message:
SCUMM: Fix Japanese strings handling for all platforms

This fixes some nasty text rendering issues in MI1 SegaCD and
INDY4 DOS/Mac Japanese versions, in which 2-byte characters
treated as separate one byte characters, and therefore any '@'
character would be treated as an escape char.

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 56c11013929..a8cd4044f68 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1495,8 +1495,7 @@ int ScummEngine::convertMessageToString(const byte *msg, byte *dst, int dstSize)
 			}
 		} else {
 			if ((chr != '@') || (_game.version >= 7 && is2ByteCharacter(_language, lastChr)) ||
-				(_game.id == GID_LOOM && _game.platform == Common::kPlatformPCEngine && _language == Common::JA_JPN) ||
-				(_game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN && checkSJISCode(lastChr))) {
+				(_language == Common::JA_JPN && checkSJISCode(lastChr))) {
 				*dst++ = chr;
 			}
 			lastChr = chr;