thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Normalize and document language maintenance

Browse source 
* Add documentation to add or maintain language values
* Fix and reorder existing entries to match ISO standards
This commit is contained in:
trembyle 2021-11-04 16:49:21 -04:00 • committed by Eugene Sandulenko
parent a2b81f837a
commit c740f96f63
24 changed files with 114 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

99
common/language.cpp
View file

@ -26,44 +26,69 @@
namespace Common {
/*
Entries should be sorted by English name of language
Explanation of language parameters:
1. two character macro language (use ISO-639 standard)
2. POSIX locale code
3. English name of language
4. two character language code followed by three character locale (use ISO-3166)
If more than one dialect or locale is needed:
1. two character locale (use ISO-3166 standard)
2. POSIX locale code
3. English name of language with locale/dialect name in parens
4. two character language code followed by three character locale (use ISO-3166)
If necessary, add entry for generic dialect
1. two character macro language (use ISO-639 standard)
2. repeat two character macro language
3. English name of language
4. two character language code followed by ANY
Additional notes:
* ZH_CHN (Hans 500) used for mainland China, Singapore, Malaysia
* ZH_TWN (Hant 502) used for Taiwan, Hong Kong, Macau, Philippines
*/
const LanguageDescription g_languages[] = {
{ "ar", "ar", "Arabic", AR_ARB }, // Modern Standard Arabic
{ "ca", "ca_ES", "Catalan", CA_ESP },
{ "nz", "nz", "Chinese", ZH_ANY }, // Generic Chinese (when only one game version exist)
{ "zh-cn", "zh_CN", "Chinese (China)", ZH_CNA },
{ "zh", "zh_TW", "Chinese (Taiwan)", ZH_TWN },
{ "hr", "hr_HR", "Croatian", HR_HRV },
{ "cz", "cs_CZ", "Czech", CZ_CZE },
{ "da", "da", "Danish", DA_DAN },
{ "nl", "nl_NL", "Dutch", NL_NLD },
{ "en", "en", "English", EN_ANY }, // Generic English (when only one game version exist)
{ "gb", "en_GB", "English (GB)", EN_GRB },
{ "us", "en_US", "English (US)", EN_USA },
{ "et", "et_EE", "Estonian", ET_EST },
{ "fi", "fi_FI", "Finnish", FI_FIN },
{ "vl", "nl_BE", "Flemish", NL_BEL },
{ "fr", "fr_FR", "French", FR_FRA },
{ "de", "de_DE", "German", DE_DEU },
{ "gr", "el_GR", "Greek", GR_GRE },
{ "he", "he_IL", "Hebrew", HE_ISR },
{ "hb", "he_IL", "Hebrew", HE_ISR }, // Deprecated
{ "hu", "hu_HU", "Hungarian", HU_HUN },
{ "it", "it_IT", "Italian", IT_ITA },
{ "jp", "ja_JP", "Japanese", JA_JPN },
{ "kr", "ko_KR", "Korean", KO_KOR },
{ "lv", "lv_LV", "Latvian", LV_LAT },
{ "nb", "nb_NO", "Norwegian Bokm\xC3\xA5l", NB_NOR },
{ "fa", "fa_IR", "Persian", FA_IRN },
{ "pl", "pl_PL", "Polish", PL_POL },
{ "br", "pt_BR", "Portuguese (Brazil)", PT_BRA },
{ "pt", "pt_PT", "Portuguese (Portugal)", PT_POR },
{ "ru", "ru_RU", "Russian", RU_RUS },
{ "sr", "sr_SP", "Serbian", SR_SER },
{ "sk", "sk_SK", "Slovak", SK_SVK },
{ "es", "es_ES", "Spanish", ES_ESP },
{ "se", "sv_SE", "Swedish", SE_SWE },
{ "tr", "tr_TR", "Turkish", TR_TUR },
{ "uk", "uk_UA", "Ukrainian", UA_UKR },
{ "ar", "ar", "Arabic", AR_ARB }, // Modern Standard Arabic
{ "ca", "ca_ES", "Catalan", CA_ESP },
{ "zh", "zh", "Chinese", ZH_ANY }, // Generic Chinese (when only one game version exist)
{ "cn", "zh_CN", "Chinese (Simplified)", ZH_CHN },
{ "tw", "zh_TW", "Chinese (Traditional)", ZH_TWN },
{ "hr", "hr_HR", "Croatian", HR_HRV },
{ "cz", "cs_CZ", "Czech", CZ_CZE },
{ "da", "da_DK", "Danish", DA_DNK },
{ "nl", "nl_NL", "Dutch", NL_NLD },
{ "en", "en", "English", EN_ANY }, // Generic English (when only one game version exist)
{ "gb", "en_GB", "English (GB)", EN_GRB },
{ "us", "en_US", "English (US)", EN_USA },
{ "et", "et_EE", "Estonian", ET_EST },
{ "fi", "fi_FI", "Finnish", FI_FIN },
{ "be", "nl_BE", "Flemish", NL_BEL },
{ "fr", "fr_FR", "French", FR_FRA },
{ "de", "de_DE", "German", DE_DEU },
{ "el", "el_GR", "Greek", EL_GRC },
{ "he", "he_IL", "Hebrew", HE_ISR },
{ "hu", "hu_HU", "Hungarian", HU_HUN },
{ "it", "it_IT", "Italian", IT_ITA },
{ "ja", "ja_JP", "Japanese", JA_JPN },
{ "ko", "ko_KR", "Korean", KO_KOR },
{ "lv", "lv_LV", "Latvian", LV_LVA },
{ "nb", "nb_NO", "Norwegian (Bokm\xC3\xA5l)", NB_NOR },
{ "fa", "fa_IR", "Persian", FA_IRN },
{ "pl", "pl_PL", "Polish", PL_POL },
{ "br", "pt_BR", "Portuguese (Brazil)", PT_BRA },
{ "pt", "pt_PT", "Portuguese (Portugal)", PT_PRT },
{ "ru", "ru_RU", "Russian", RU_RUS },
{ "sr", "sr_RS", "Serbian", SR_SRB },
{ "sk", "sk_SK", "Slovak", SK_SVK },
{ "es", "es_ES", "Spanish", ES_ESP },
{ "se", "sv_SE", "Swedish", SE_SWE },
{ "tr", "tr_TR", "Turkish", TR_TUR },
{ "uk", "uk_UA", "Ukrainian", UA_UKR },
{ nullptr, nullptr, nullptr, UNK_LANG }
};

14
common/language.h
View file

@ -46,38 +46,38 @@ enum Language {
AR_ARB,
CA_ESP,
CZ_CZE,
DA_DAN,
DA_DNK,
DE_DEU,
EL_GRC,
EN_ANY, // Generic English (when only one game version exist)
EN_GRB,
EN_USA,
ES_ESP,
ET_EST,
FI_FIN,
FA_IRN,
FI_FIN,
FR_FRA,
GR_GRE,
HE_ISR,
HR_HRV,
HU_HUN,
IT_ITA,
JA_JPN,
KO_KOR,
LV_LAT,
LV_LVA,
NL_BEL,
NL_NLD,
NB_NOR,
PL_POL,
PT_BRA,
PT_POR,
PT_PRT,
RU_RUS,
SE_SWE,
SK_SVK,
SR_SER,
SR_SRB,
TR_TUR,
UA_UKR,
ZH_ANY, // Generic Chinese (when only one game version exist)
ZH_CNA,
ZH_CHN,
ZH_TWN,
UNK_LANG = -1 // Use default language (i.e. none specified)

2
devtools/create_kyradat/create_kyradat.cpp
View file

@ -1199,7 +1199,7 @@ const TypeTable languageTable[] = {
{ JA_JPN, 6 },
{ RU_RUS, 7 },
{ HE_ISR, 8 },
{ ZH_CNA, 9 },
{ ZH_CHN, 9 },
{ ZH_TWN, 10 },
{ -1, -1 }
};

2
devtools/create_kyradat/games.cpp
View file

@ -99,7 +99,7 @@ const Game kyra3Games[] = {
{ kKyra3, kPlatformDOS, kTalkieVersion, IT_ITA },
{ kKyra3, kPlatformDOS, kTalkieVersion, ES_ESP },
{ kKyra3, kPlatformDOS, kTalkieVersion, RU_RUS },
{ kKyra3, kPlatformDOS, kTalkieVersion, ZH_CNA },
{ kKyra3, kPlatformDOS, kTalkieVersion, ZH_CHN },
{ kKyra3, kPlatformDOS, kTalkieVersion, ZH_TWN },
GAME_DUMMY_ENTRY

8
devtools/create_kyradat/resources.cpp
View file

@ -1022,7 +1022,7 @@ static const ResourceProvider resourceProviders[] = {
{ k3MainMenuStrings, kKyra3, kPlatformDOS, kTalkieVersion, IT_ITA, &k3MainMenuStringsDOSCDItalianProvider },
{ k3MainMenuStrings, kKyra3, kPlatformDOS, kTalkieVersion, ES_ESP, &k3MainMenuStringsDOSCDSpanishProvider },
{ k3MainMenuStrings, kKyra3, kPlatformDOS, kTalkieVersion, RU_RUS, &k3MainMenuStringsDOSCDRussianProvider },
{ k3MainMenuStrings, kKyra3, kPlatformDOS, kTalkieVersion, ZH_CNA, &k3MainMenuStringsDOSCDChineseSmplProvider },
{ k3MainMenuStrings, kKyra3, kPlatformDOS, kTalkieVersion, ZH_CHN, &k3MainMenuStringsDOSCDChineseSmplProvider },
{ k3MainMenuStrings, kKyra3, kPlatformDOS, kTalkieVersion, ZH_TWN, &k3MainMenuStringsDOSCDChineseTradProvider },
{ k3MusicFiles, kKyra3, kPlatformDOS, kTalkieVersion, UNK_LANG, &k3MusicFilesDOSCDProvider },
{ k3ScoreTable, kKyra3, kPlatformDOS, kTalkieVersion, UNK_LANG, &k3ScoreTableDOSCDProvider },
@ -1037,7 +1037,7 @@ static const ResourceProvider resourceProviders[] = {
{ k3FontData, kKyra3, kPlatformDOS, kTalkieVersion, IT_ITA, &k3DummyDataDOSCDProvider },
{ k3FontData, kKyra3, kPlatformDOS, kTalkieVersion, ES_ESP, &k3DummyDataDOSCDProvider },
{ k3FontData, kKyra3, kPlatformDOS, kTalkieVersion, RU_RUS, &k3DummyDataDOSCDProvider },
{ k3FontData, kKyra3, kPlatformDOS, kTalkieVersion, ZH_CNA, &k3FontDataDOSCDChineseSmplProvider },
{ k3FontData, kKyra3, kPlatformDOS, kTalkieVersion, ZH_CHN, &k3FontDataDOSCDChineseSmplProvider },
{ k3FontData, kKyra3, kPlatformDOS, kTalkieVersion, ZH_TWN, &k3FontDataDOSCDChineseTradProvider },
{ k3VqaSubtitlesIntro, kKyra3, kPlatformDOS, kTalkieVersion, EN_ANY, &k3VqaSubtitlesIntroDOSCDEnglishProvider },
{ k3VqaSubtitlesIntro, kKyra3, kPlatformDOS, kTalkieVersion, FR_FRA, &k3VqaSubtitlesIntroDOSCDFrenchProvider },
@ -1045,7 +1045,7 @@ static const ResourceProvider resourceProviders[] = {
{ k3VqaSubtitlesIntro, kKyra3, kPlatformDOS, kTalkieVersion, IT_ITA, &k3VqaSubtitlesIntroDOSCDItalianProvider },
{ k3VqaSubtitlesIntro, kKyra3, kPlatformDOS, kTalkieVersion, ES_ESP, &k3VqaSubtitlesIntroDOSCDSpanishProvider },
{ k3VqaSubtitlesIntro, kKyra3, kPlatformDOS, kTalkieVersion, RU_RUS, &k3VqaSubtitlesIntroDOSCDRussianProvider },
{ k3VqaSubtitlesIntro, kKyra3, kPlatformDOS, kTalkieVersion, ZH_CNA, &k3VqaSubtitlesIntroDOSCDChineseSmplProvider },
{ k3VqaSubtitlesIntro, kKyra3, kPlatformDOS, kTalkieVersion, ZH_CHN, &k3VqaSubtitlesIntroDOSCDChineseSmplProvider },
{ k3VqaSubtitlesIntro, kKyra3, kPlatformDOS, kTalkieVersion, ZH_TWN, &k3VqaSubtitlesIntroDOSCDChineseTradProvider },
{ k3VqaSubtitlesBoat, kKyra3, kPlatformDOS, kTalkieVersion, EN_ANY, &k3VqaSubtitlesBoatDOSCDEnglishProvider },
{ k3VqaSubtitlesBoat, kKyra3, kPlatformDOS, kTalkieVersion, FR_FRA, &k3VqaSubtitlesBoatDOSCDFrenchProvider },
@ -1053,7 +1053,7 @@ static const ResourceProvider resourceProviders[] = {
{ k3VqaSubtitlesBoat, kKyra3, kPlatformDOS, kTalkieVersion, IT_ITA, &k3VqaSubtitlesBoatDOSCDItalianProvider },
{ k3VqaSubtitlesBoat, kKyra3, kPlatformDOS, kTalkieVersion, ES_ESP, &k3VqaSubtitlesBoatDOSCDSpanishProvider },
{ k3VqaSubtitlesBoat, kKyra3, kPlatformDOS, kTalkieVersion, RU_RUS, &k3VqaSubtitlesBoatDOSCDRussianProvider },
{ k3VqaSubtitlesBoat, kKyra3, kPlatformDOS, kTalkieVersion, ZH_CNA, &k3VqaSubtitlesBoatDOSCDChineseSmplProvider },
{ k3VqaSubtitlesBoat, kKyra3, kPlatformDOS, kTalkieVersion, ZH_CHN, &k3VqaSubtitlesBoatDOSCDChineseSmplProvider },
{ k3VqaSubtitlesBoat, kKyra3, kPlatformDOS, kTalkieVersion, ZH_TWN, &k3VqaSubtitlesBoatDOSCDChineseTradProvider },
{ kEoBBaseNpcPresetsNames, kEoB1, kPlatformDOS, kNoSpecial, EN_ANY, &kEoB1NpcPresetsNamesDOSEnglishProvider },
{ kEoBBaseChargenStrings1, kEoB1, kPlatformDOS, kNoSpecial, EN_ANY, &kEoB1ChargenStrings1DOSEnglishProvider },

1
engines/advancedDetector.cpp
View file

@ -248,7 +248,6 @@ bool AdvancedMetaEngineDetection::cleanupPirated(ADDetectedGames &matched) const
return false;
}
DetectedGames AdvancedMetaEngineDetection::detectGames(const Common::FSList &fslist) const {
FileMap allFiles;

2
engines/bladerunner/detection_tables.h
View file

@ -129,7 +129,7 @@ static const ADGameDescription gameDescriptions[] = {
_s("Missing game code"), // Reason for being unsupported
AD_ENTRY2s("STARTUP.MIX", "c198b54a5366b88b1734bbca21d3b192", 2678672,
"95blade.dll", "187f257c3183d6b0a0aee69e5cde4c76", 307200),
Common::ZH_CNA,
Common::ZH_CHN,
Common::kPlatformWindows,
ADGF_UNSUPPORTED,
GUIO6(GAMEOPTION_SITCOM, GAMEOPTION_SHORTY, GAMEOPTION_FRAMELIMITER_NODELAYMILLIS, GAMEOPTION_FRAMELIMITER_FPS, GAMEOPTION_DISABLE_STAMINA_DRAIN, GUIO_NOMIDI)

28
engines/director/detection_tables.h
View file

@ -2632,7 +2632,7 @@ static const DirectorGameDescription gameDescriptions[] = {
WINGAME2_l("dcanyon", "", "DCANYON.EXE", "f5033a9fd54d41d348fa97bd13f8f088", 1050728,
"00intro.Dir", "f6ca66b328f7fbcdd2e911273d74677c", 3777126, Common::IT_ITA, 404),
WINGAME2_l("dcanyon", "", "DCANYON.EXE", "85e7939a0c3041660defb80e0d530230", 744381,
"00INTRO.DIR", "3621850ac727f9cf116c41143482c16c", 4044830, Common::ZH_CNA, 404),
"00INTRO.DIR", "3621850ac727f9cf116c41143482c16c", 4044830, Common::ZH_CHN, 404),
WINGAME1("dcanyoncd", "", "DINO_CD.EXE", "5fe054ed623541a92c04f1572ecb6c5d", 3160272, 404),
// Mac executable is Derrat Sorcerum™ v1.0.3
@ -2643,8 +2643,8 @@ static const DirectorGameDescription gameDescriptions[] = {
MACGAME1("devo", "", "Smart Patrol", "01be45e7241194dad07938e7059b88e3", 478506, 400),
WINGAME1("devo", "", "SMRTPTRL.EXE", "6030100dbff520b8763f6e98d15389d7", 741904, 400),
MACGAME1_l("digby", "", "Start Digby's Adventures", "a8e65a2268226bd59f12ebdc58a221f3", 481482, Common::ZH_CNA, 404),
WINGAME1_l("digby", "", "DIGBY.EXE", "adc126fbc4387e5d8e84dcd5abd33653", 684269, Common::ZH_CNA, 400),
MACGAME1_l("digby", "", "Start Digby's Adventures", "a8e65a2268226bd59f12ebdc58a221f3", 481482, Common::ZH_CHN, 404),
WINGAME1_l("digby", "", "DIGBY.EXE", "adc126fbc4387e5d8e84dcd5abd33653", 684269, Common::ZH_CHN, 400),
MACDEMO1_l("dirmacromedia", "v4.0.3J Demo", "Director 4.0 Demo", "e258089af01c8233db77039828cc83f8", 1488951, Common::JA_JPN, 403),
@ -2895,11 +2895,11 @@ static const DirectorGameDescription gameDescriptions[] = {
// English is always available, along with one alternate language
// Dutch version was localized by Pride Kids Interactive of Ede, Netherlands
MACGAME2_l("hamsterland1", "", "Hamsterland", "bcd3c718db258701496b3c5bcb827ef2", 483774,
"AIRDK", "f74f18a9d454db63465dac151a6b5706", 8425728, Common::DA_DAN, 400),
"AIRDK", "f74f18a9d454db63465dac151a6b5706", 8425728, Common::DA_DNK, 400),
MACGAME2_l("hamsterland1", "", "Hamsterland", "bcd3c718db258701496b3c5bcb827ef2", 483774,
"AIRSW", "ccf7c642796c5aeb9fee4c663bdd02d9", 7588992, Common::SE_SWE, 400),
WINGAME2_l("hamsterland1", "", "HAMSTER.EXE", "2bb6e93d9aab502f46dbf163d51eb785", 785327,
"AIRDK", "ad98bbbd724e31a8a125e284a74d0241", 8425546, Common::DA_DAN, 400),
"AIRDK", "ad98bbbd724e31a8a125e284a74d0241", 8425546, Common::DA_DNK, 400),
WINGAME2_l("hamsterland1", "", "HAMSTER.EXE", "a0d2cfdf10ec14c00338329277bc8acc", 727653,
"AIRSP", "9b5b82d488b96b2fcf5e78ec8769e29a", 8432260, Common::ES_ESP, 400),
WINGAME2_l("hamsterland1", "", "HAMSTER.EXE", "11669580c1f85b8caa4cd02373e7c947", 785221,
@ -4972,11 +4972,11 @@ static const DirectorGameDescription gameDescriptions[] = {
// Projectors on the installation disc for Swedish, Norwegian, Danish, Finnish
MACGAME1_l("polis1", "", "KRIPOS", "921df0a5f150a57b621baa2cace66e12", 1032653, Common::NB_NOR, 650),
MACGAME1_l("polis1", "", "STRISSER", "921df0a5f150a57b621baa2cace66e12", 1032653, Common::DA_DAN, 650),
MACGAME1_l("polis1", "", "STRISSER", "921df0a5f150a57b621baa2cace66e12", 1032653, Common::DA_DNK, 650),
MACGAME1_l("polis1", "", "POLIS", "921df0a5f150a57b621baa2cace66e12", 1032653, Common::SE_SWE, 650),
MACGAME1_l("polis1", "", "POLIISI", "921df0a5f150a57b621baa2cace66e12", 1032653, Common::FI_FIN, 650),
WINGAME1_l("polis1", "", "Kripos.exe", "d62438566e44826960fc16c5c23dbe43", 1514881, Common::NB_NOR, 650),
WINGAME1_l("polis1", "", "Strisser.exe", "d62438566e44826960fc16c5c23dbe43", 1514881, Common::DA_DAN, 650),
WINGAME1_l("polis1", "", "Strisser.exe", "d62438566e44826960fc16c5c23dbe43", 1514881, Common::DA_DNK, 650),
WINGAME1_l("polis1", "", "Polis.exe", "d62438566e44826960fc16c5c23dbe43", 1514881, Common::SE_SWE, 650),
WINGAME1_l("polis1", "", "Poliisi.exe", "d62438566e44826960fc16c5c23dbe43", 1514881, Common::FI_FIN, 650),
@ -5150,9 +5150,9 @@ static const DirectorGameDescription gameDescriptions[] = {
// Later releases are D8
WINGAME1_l("beautyorbeast", "", "Beauty or the Beast.exe", "02b0d114c93b598c737b1c627178195c", 2190754, Common::RU_RUS, 702),
MACGAME1_l("bellini3", "", "Bellinis bikini", "0944b962ebb00f4b5d5149d220f8449b", 114321, Common::DA_DAN, 702),
MACGAME1_l("bellini3", "", "Bellinis bikini", "0944b962ebb00f4b5d5149d220f8449b", 114321, Common::DA_DNK, 702),
MACGAME1_l("bellini3", "", "Bellinin bikinit", "0944b962ebb00f4b5d5149d220f8449b", 114321, Common::FI_FIN, 702),
WINGAME1_l("bellini3", "", "Bellinis bikini.exe", "7c18c9a6af2694156bf09ed195c1ab09", 2596204, Common::DA_DAN, 702),
WINGAME1_l("bellini3", "", "Bellinis bikini.exe", "7c18c9a6af2694156bf09ed195c1ab09", 2596204, Common::DA_DNK, 702),
WINGAME1_l("bellini3", "", "Bellinin bikinit.exe", "7c18c9a6af2694156bf09ed195c1ab09", 2596204, Common::FI_FIN, 702),
MACGAME1_l("bibi2", "", "Spielstart", "0944b962ebb00f4b5d5149d220f8449b", 117347, Common::DE_DEU, 702),
@ -5458,10 +5458,10 @@ static const DirectorGameDescription gameDescriptions[] = {
MACDEMO1("balto2", "Trailer", "MacBolto", "08c9ea94f6469e71ae0c71987bbf6323", 155737, 850),
WINDEMO1("balto2", "Trailer", "Balto.exe", "c163f36141579ee374f7b4b2bddee95a", 2309044, 850),
MACGAME1_l("bamse1", "", "Spillerom", "a44511b8ff0e46b4f9c85dd1cb58d458", 199093, Common::DA_DAN, 851),
MACGAME1_l("bamse2", "", "Bamses egen", "a44511b8ff0e46b4f9c85dd1cb58d458", 157079, Common::DA_DAN, 851),
WINGAME1_l("bamse1", "", "spillerom.exe", "0c81c84ca4966313ad27d47daba44537", 2158320, Common::DA_DAN, 851),
WINGAME1_l("bamse2", "", "Bamsesegen.exe", "0c81c84ca4966313ad27d47daba44537", 2158340, Common::DA_DAN, 851),
MACGAME1_l("bamse1", "", "Spillerom", "a44511b8ff0e46b4f9c85dd1cb58d458", 199093, Common::DA_DNK, 851),
MACGAME1_l("bamse2", "", "Bamses egen", "a44511b8ff0e46b4f9c85dd1cb58d458", 157079, Common::DA_DNK, 851),
WINGAME1_l("bamse1", "", "spillerom.exe", "0c81c84ca4966313ad27d47daba44537", 2158320, Common::DA_DNK, 851),
WINGAME1_l("bamse2", "", "Bamsesegen.exe", "0c81c84ca4966313ad27d47daba44537", 2158340, Common::DA_DNK, 851),
MACGAME1("barbrapunzel", "", "Rapunzel", "08c9ea94f6469e71ae0c71987bbf6323", 213604, 850),
MACDEMO1("barbrapunzel", "Trailer", "Trailer", "08c9ea94f6469e71ae0c71987bbf6323", 155737, 850),
@ -5714,7 +5714,7 @@ static const DirectorGameDescription gameDescriptions[] = {
MACGAME1_l("sethi3", "Classic OS", "Start Me OS9", "789536da81694518f494945bb161ace9", 179887, Common::DE_DEU, 851),
WINGAME1_l("sethi2", "", "Sethi_Incas.exe", "0c81c84ca4966313ad27d47daba44537", 2158774, Common::FR_FRA, 851),
WINGAME1_l("skeeto10", "", "mm7main.exe", "0c81c84ca4966313ad27d47daba44537", 12051446, Common::DA_DAN, 851),
WINGAME1_l("skeeto10", "", "mm7main.exe", "0c81c84ca4966313ad27d47daba44537", 12051446, Common::DA_DNK, 851),
// Dutch demos found on Flipper & Lopaka compilation
MACGAME1_l("skippy", "", "Skippy", "4ea5fc09f79eee6dded94dc40f303779", 197127, Common::NL_NLD, 800),

4
engines/kyra/detection_tables.h
View file

@ -1188,7 +1188,7 @@ const KYRAGameDescription adGameDescs[] = {
0,
AD_ENTRY2s("ONETIME.PAK", "93b4ca2847ab7cfe52188cbde2ffe561", -1,
"WESTWOOD.001", "c782e09a3b80510962af1426acf5a130", -1),
Common::ZH_CNA,
Common::ZH_CHN,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
GUIO5(GUIO_NOMIDI, GUIO_RENDERVGA, GAMEOPTION_KYRA3_AUDIENCE, GAMEOPTION_KYRA3_SKIP, GAMEOPTION_KYRA3_HELIUM)
@ -1262,7 +1262,7 @@ const KYRAGameDescription adGameDescs[] = {
{ "AUD.PAK", 0, 0, -1 },
AD_LISTEND
},
Common::ZH_CNA,
Common::ZH_CHN,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
GUIO5(GUIO_NOMIDI, GUIO_RENDERVGA, GAMEOPTION_KYRA3_AUDIENCE, GAMEOPTION_KYRA3_SKIP, GAMEOPTION_KYRA3_HELIUM)

4
engines/kyra/engine/kyra_mr.cpp
View file

@ -486,7 +486,7 @@ void KyraEngine_MR::playStudioSFX(const char *str) {
return;
const int strSize = strlen(str) - 1;
if (_flags.lang == Common::ZH_CNA || _flags.lang == Common::ZH_TWN) {
if (_flags.lang == Common::ZH_CHN || _flags.lang == Common::ZH_TWN) {
// WORKAROUND: The studio sfx is broken in the original, since it still has the
// check for '!' and '?' even if the language is set to Chinese. I have fixed this here...
if (str[strSize] != '\x80' || !(str[strSize - 1] == '\x81' || str[strSize - 1] == '\x91'))
@ -1414,7 +1414,7 @@ void KyraEngine_MR::writeSettings() {
break;
case 3:
_flags.lang = _langIntern ? Common::ZH_TWN : Common::ZH_CNA;
_flags.lang = _langIntern ? Common::ZH_TWN : Common::ZH_CHN;
break;
default:

2
engines/kyra/engine/kyra_v2.cpp
View file

@ -101,7 +101,7 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags, const Engi
_langIntern = 1;
// fall through
case Common::JA_JPN:
case Common::ZH_CNA:
case Common::ZH_CHN:
_lang = 3;
break;

10
engines/kyra/gui/gui_v1.cpp
View file

@ -139,7 +139,7 @@ void GUI_v1::initMenu(Menu &menu) {
} else {
Screen::FontId of = _screen->_currentFont;
if (menu.item[i].saveSlot > 0)
_screen->setFont((_vm->gameFlags().lang == Common::ZH_CNA || _vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_CHINESE_FNT : Screen::FID_8_FNT);
_screen->setFont((_vm->gameFlags().lang == Common::ZH_CHN || _vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_CHINESE_FNT : Screen::FID_8_FNT);
if (_vm->gameFlags().platform != Common::kPlatformAmiga)
printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
@ -259,7 +259,7 @@ void GUI_v1::redrawText(const Menu &menu) {
} else {
Screen::FontId of = _screen->_currentFont;
if (menu.item[i].saveSlot > 0)
_screen->setFont((_vm->gameFlags().lang == Common::ZH_CNA || _vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_CHINESE_FNT : Screen::FID_8_FNT);
_screen->setFont((_vm->gameFlags().lang == Common::ZH_CHN || _vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_CHINESE_FNT : Screen::FID_8_FNT);
if (_vm->gameFlags().platform != Common::kPlatformAmiga)
printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].textColor, 0, 0);
@ -289,7 +289,7 @@ void GUI_v1::redrawHighlight(const Menu &menu) {
} else {
Screen::FontId of = _screen->_currentFont;
if (menu.item[i].saveSlot > 0)
_screen->setFont((_vm->gameFlags().lang == Common::ZH_CNA || _vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_CHINESE_FNT : Screen::FID_8_FNT);
_screen->setFont((_vm->gameFlags().lang == Common::ZH_CHN || _vm->gameFlags().lang == Common::ZH_TWN) ? Screen::FID_CHINESE_FNT : Screen::FID_8_FNT);
if (_vm->gameFlags().platform != Common::kPlatformAmiga)
printMenuText(getMenuItemTitle(menu.item[i]), textX - 1, textY + 1, defaultColor1(), 0, 0);
printMenuText(getMenuItemTitle(menu.item[i]), textX, textY, menu.item[i].highlightColor, 0, 0);
@ -511,7 +511,7 @@ int MainMenu::handle(int dim) {
int fh = _screen->getFontHeight();
if (_vm->gameFlags().lang == Common::JA_JPN)
fh++;
else if (_vm->gameFlags().lang == Common::ZH_CNA || _vm->gameFlags().lang == Common::ZH_TWN)
else if (_vm->gameFlags().lang == Common::ZH_CHN || _vm->gameFlags().lang == Common::ZH_TWN)
fh--;
int textPos = ((_screen->_curDim->w >> 1) + _screen->_curDim->sx) << 3;
@ -565,7 +565,7 @@ void MainMenu::draw(int select) {
int fh = _screen->getFontHeight();
if (_vm->gameFlags().lang == Common::JA_JPN)
fh++;
else if (_vm->gameFlags().lang == Common::ZH_CNA || _vm->gameFlags().lang == Common::ZH_TWN)
else if (_vm->gameFlags().lang == Common::ZH_CHN || _vm->gameFlags().lang == Common::ZH_TWN)
fh--;
for (int i = 0; i < _static.menuTable[3]; ++i) {

2
engines/kyra/gui/gui_v2.cpp
View file

@ -447,7 +447,7 @@ void GUI_v2::setupSavegameNames(Menu &menu, int num) {
Common::String s = header.description;
s = Util::convertUTF8ToDOS(s);
if (_vm->gameFlags().lang == Common::JA_JPN || _vm->gameFlags().lang == Common::ZH_CNA || _vm->gameFlags().lang == Common::ZH_TWN) {
if (_vm->gameFlags().lang == Common::JA_JPN || _vm->gameFlags().lang == Common::ZH_CHN || _vm->gameFlags().lang == Common::ZH_TWN) {
// Strip special characters from GMM save dialog which might get misinterpreted as 2-byte characters
for (Common::String::iterator ii = s.begin(); ii != s.end(); ++ii) {
if (*ii < 32) // due to the signed char type this will also clean up everything >= 0x80

2
engines/kyra/resource/staticres.cpp
View file

@ -95,7 +95,7 @@ const IndexTable iLanguageTable[] = {
{ Common::JA_JPN, 6 },
{ Common::RU_RUS, 7 },
{ Common::HE_ISR, 8 },
{ Common::ZH_CNA, 9 },
{ Common::ZH_CHN, 9 },
{ Common::ZH_TWN, 10 },
{ -1, -1 }
};

2
engines/myst3/detection.cpp
View file

@ -146,7 +146,7 @@ static const Myst3GameDescription gameDescriptions[] = {
{ "localized.m3t", 0, "3a9f299f8d061ce3d2862d985edb84e3", 2341588 },
{ "ENGLISHjp.m3t", 0, "19dcba1074f235ec2119313242d891de", 5658925 },
},
Common::ZH_CNA,
Common::ZH_CHN,
Common::kPlatformWindows,
ADGF_UNSUPPORTED,
GUIO_NONE

2
engines/pink/objects/actions/action_text.cpp
View file

@ -87,7 +87,7 @@ void ActionText::start() {
delete stream;
switch(_actor->getPage()->getGame()->getLanguage()) {
case Common::DA_DAN:
case Common::DA_DNK:
case Common::ES_ESP:
case Common::FR_FRA:
case Common::PT_BRA:

2
engines/scumm/charset.h
View file

@ -59,7 +59,7 @@ static inline bool is2ByteCharacter(Common::Language lang, byte c) {
return (c >= 0x80 && c <= 0x9F) || (c >= 0xE0 && c <= 0xFD);
else if (lang == Common::KO_KOR)
return (c >= 0xB0 && c <= 0xD0);
else if (lang == Common::ZH_TWN || lang == Common::ZH_CNA)
else if (lang == Common::ZH_TWN || lang == Common::ZH_CHN)
return (c >= 0x80);
return false;
}

2
engines/scumm/detection_internal.h
View file

@ -215,7 +215,7 @@ static Common::Language detectLanguage(const Common::FSList &fslist, byte id, Co
if (searchFSNode(fslist, "chinese_gb16x12.fnt", fontFile)) {
debugC(0, kDebugGlobalDetection, "Chinese detected");
return Common::ZH_CNA;
return Common::ZH_CHN;
}
if (id != GID_CMI && id != GID_DIG) {

2
engines/scumm/dialogs.cpp
View file

@ -376,7 +376,7 @@ static bool isCJKLanguage(Common::Language lang) {
case Common::KO_KOR:
case Common::JA_JPN:
case Common::ZH_TWN:
case Common::ZH_CNA:
case Common::ZH_CHN:
return true;
default:
return false;

2
engines/scumm/smush/smush_font.h
View file

@ -53,7 +53,7 @@ public:
return (c >= 0x80 && c <= 0x9F) || (c >= 0xE0 && c <= 0xFD);
else if (lang == Common::KO_KOR)
return (c >= 0xB0 && c <= 0xD0);
else if (lang == Common::ZH_TWN || lang == Common::ZH_CNA)
else if (lang == Common::ZH_TWN || lang == Common::ZH_CHN)
return (c >= 0x80);
return false;
}

2
engines/scumm/string.cpp
View file

@ -2142,7 +2142,7 @@ Common::CodePage ScummEngine::getDialogCodePage() const {
case Common::JA_JPN:
return Common::kWindows932;
case Common::ZH_TWN:
case Common::ZH_CNA:
case Common::ZH_CHN:
return Common::kWindows950;
case Common::RU_RUS:
return Common::kDos866;

2
engines/twine/detection.cpp
View file

@ -453,7 +453,7 @@ static const ADGameDescription twineGameDescriptions[] = {
"lba",
"Fan Translation by xesf",
AD_ENTRY1s("TEXT.HQR", "2a8df71946aa9ee4c777a9d6414b89ce", 282308),
Common::PT_POR,
Common::PT_PRT,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GUIO_NONE)

6
engines/wintermute/detection_tables.h
View file

@ -3974,7 +3974,7 @@ static const WMEGameDescription gameDescriptions[] = {
// Reversion: The Return (Steam, November 2020) (Serbian)
WME_WINENTRY("reversion3", "Steam",
WME_ENTRY2s("data.dcp", "5df2540652f0b77d8bb48e7454840c5e", 1806937960,
"xlanguage_sr.dcp", "dc43cc4e382dfa8b4a336e9fcc723bf3", 10164273), Common::SR_SER, ADGF_UNSTABLE, WME_1_9_2),
"xlanguage_sr.dcp", "dc43cc4e382dfa8b4a336e9fcc723bf3", 10164273), Common::SR_SRB, ADGF_UNSTABLE, WME_1_9_2),
// Reversion: The Return (Steam, December 2020) (Spanish)
WME_WINENTRY("reversion3", "Steam",
@ -4009,12 +4009,12 @@ static const WMEGameDescription gameDescriptions[] = {
// Reversion: The Return (Steam, December 2020) (Serbian)
WME_WINENTRY("reversion3", "Steam",
WME_ENTRY2s("data.dcp", "ca788ebe1b607c24c3e4db4771c16559", 1806937971,
"xlanguage_sr.dcp", "e16438a25527e99fb974dd2cdb5ed945", 10164285), Common::SR_SER, ADGF_UNSTABLE, WME_1_9_2),
"xlanguage_sr.dcp", "e16438a25527e99fb974dd2cdb5ed945", 10164285), Common::SR_SRB, ADGF_UNSTABLE, WME_1_9_2),
// Reversion: The Return (Steam, December 2020) (Simplified Chinese)
WME_WINENTRY("reversion3", "Steam",
WME_ENTRY2s("data.dcp", "ca788ebe1b607c24c3e4db4771c16559", 1806937971,
"xlanguage_zh_s.dcp", "d82a5708af24a879cbeaf7338ea89ab4", 10233899), Common::ZH_CNA, ADGF_UNSTABLE, WME_1_9_2),
"xlanguage_zh_s.dcp", "d82a5708af24a879cbeaf7338ea89ab4", 10233899), Common::ZH_CHN, ADGF_UNSTABLE, WME_1_9_2),
// Reversion: The Return (Steam, December 2020) (Traditional Chinese)
WME_WINENTRY("reversion3", "Steam",

2
gui/ThemeEngine.cpp
View file

@ -584,7 +584,7 @@ Common::Array<Common::Language> getLangIdentifiers(const Common::String &languag
{ "ja", Common::JA_JPN },
{ "ko", Common::KO_KOR },
{ "zh", Common::ZH_ANY },
{ "zh", Common::ZH_CNA },
{ "zh", Common::ZH_CHN },
{ "zh", Common::ZH_TWN }
};