[Scummvm-git-logs] scummvm master -> a619827ffa704b08ea6a8333f618601477d08a95

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6c97dcbb4a COMMON: Rename ZH_ANY language code nz -> zh
a619827ffa SWORD1: Improved detection for demos. Now Spanish demo is detected properly


Commit: 6c97dcbb4a0b323aadc2d5445bd63bcbc06a1473
    https://github.com/scummvm/scummvm/commit/6c97dcbb4a0b323aadc2d5445bd63bcbc06a1473
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-01T16:37:36+02:00

Commit Message:
COMMON: Rename ZH_ANY language code nz -> zh

Since it concerns only one game in Wintermute ATM, I don't
bother implementing autoupgrade

Changed paths:
    common/language.cpp


diff --git a/common/language.cpp b/common/language.cpp
index 7f2ac5e355..e86627fec9 100644
--- a/common/language.cpp
+++ b/common/language.cpp
@@ -27,7 +27,7 @@
 namespace Common {
 
 const LanguageDescription g_languages[] = {
-	{    "nz",    "nz", "Chinese", ZH_ANY }, // Generic Chinese (when only one game version exist)
+	{    "zh",    "zh", "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 },


Commit: a619827ffa704b08ea6a8333f618601477d08a95
    https://github.com/scummvm/scummvm/commit/a619827ffa704b08ea6a8333f618601477d08a95
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-01T16:37:36+02:00

Commit Message:
SWORD1: Improved detection for demos. Now Spanish demo is detected properly

Changed paths:
    engines/sword1/detection.cpp
    engines/sword1/sword1.cpp


diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index 02e5f60a56..fdd1377430 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -49,7 +49,7 @@ static const PlainGameDescriptor sword1PSXDemoSettings =
 
 
 // check these subdirectories (if present)
-static const char *const g_dirNames[] = { "clusters", "speech", "english", "italian"};
+static const char *const g_dirNames[] = { "clusters", "music", "speech", "english", "italian"};
 
 #define NUM_COMMON_FILES_TO_CHECK 1
 #define NUM_PC_FILES_TO_CHECK 3
@@ -69,7 +69,7 @@ static const char *const g_filesToCheck[NUM_FILES_TO_CHECK] = { // these files h
 	"compacts.clm", // Mac version only
 	"scripts.clm", // Mac version only
 	"paris2.clm", // Mac version (full game only)
-	"cows.mad", // this one should only exist in the demo version
+	"1m14a.wav", // this one should only exist in the demo version
 	"scripts.clm", // Mac version both demo and full game
 	"train.plx", // PSX version only
 	"speech.dat", // PSX version only
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index f76c46bdb8..5ba0de96f6 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -289,7 +289,7 @@ const CdFile SwordEngine::_pcCdFileList[] = {
 	{ "scripts.clu", FLAG_CD1 | FLAG_DEMO | FLAG_IMMED },
 	{ "swordres.rif", FLAG_CD1 | FLAG_DEMO | FLAG_IMMED },
 	{ "text.clu", FLAG_CD1 | FLAG_DEMO },
-	{ "cows.mad", FLAG_DEMO },
+	{ "1m14a.wav", FLAG_DEMO },
 	{ "speech1.clu", FLAG_SPEECH1 },
 	{ "speech2.clu", FLAG_SPEECH2 }
 #ifdef USE_FLAC