[Scummvm-git-logs] scummvm master -> 8ee55676de54952d5c0a1a47e026cf6e9c5f86c6

[phcoder]

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:
8ee55676de SHERLOCK: Use more accurate ZH_CHN rather than ZH_ANY for Rose Tattoo


Commit: 8ee55676de54952d5c0a1a47e026cf6e9c5f86c6
    https://github.com/scummvm/scummvm/commit/8ee55676de54952d5c0a1a47e026cf6e9c5f86c6
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-03-19T18:41:36+01:00

Commit Message:
SHERLOCK: Use more accurate ZH_CHN rather than ZH_ANY for Rose Tattoo

Changed paths:
    engines/sherlock/detection_tables.h
    engines/sherlock/fonts.cpp
    engines/sherlock/tattoo/tattoo_fixed_text.cpp


diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index 2b812a8958a..f37b80a0e84 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -298,7 +298,7 @@ static const SherlockGameDescription gameDescriptions[] = {
 			"rosetattoo",
 			"CD",
 			AD_ENTRY1s("talk.lib", "dfd699efdce02a045f46d15da2d44b76", 582381),
-			Common::ZH_ANY,
+			Common::ZH_CHN,
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
 			GUIO3(GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_HELP_STYLE, GAMEOPTION_TRANSPARENT_WINDOWS)
diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index 54f6b04e1b9..94bc1b6fefd 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -44,7 +44,7 @@ void Fonts::setVm(SherlockEngine *vm) {
 	_vm = vm;
 	_font = nullptr;
 	_charCount = 0;
-	_isModifiedEucCn = (_vm->getLanguage() == Common::Language::ZH_ANY && _vm->getGameID() == GameType::GType_RoseTattoo);
+	_isModifiedEucCn = (_vm->getLanguage() == Common::Language::ZH_CHN && _vm->getGameID() == GameType::GType_RoseTattoo);
 	_isBig5 = (_vm->getLanguage() == Common::Language::ZH_TWN && _vm->getGameID() == GameType::GType_SerratedScalpel);
 }
 
diff --git a/engines/sherlock/tattoo/tattoo_fixed_text.cpp b/engines/sherlock/tattoo/tattoo_fixed_text.cpp
index b14dc4c6eac..d7092393474 100644
--- a/engines/sherlock/tattoo/tattoo_fixed_text.cpp
+++ b/engines/sherlock/tattoo/tattoo_fixed_text.cpp
@@ -958,7 +958,7 @@ static const FixedTextLanguageEntry fixedTextLanguages[] = {
 	{ Common::ES_ESP,   fixedTextES },
 	{ Common::EN_ANY,   fixedTextEN },
 	{ Common::FR_FRA,   fixedTextFR },
-	{ Common::ZH_ANY,   fixedTextZH },
+	{ Common::ZH_CHN,   fixedTextZH },
 	{ Common::UNK_LANG, fixedTextEN }
 };