[Scummvm-cvs-logs] scummvm master -> e180612ff5d636b11710080f816f5e073c34d876

lordhoto lordhoto at gmail.com
Thu Dec 5 16:45:21 CET 2013


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

Summary:
a94c66f1e3 COMMON: Fix order of languages.
df07a4655b COMMON: Add Latvian language code.
dce90064b9 WINTERMUTE: Add Reversion: The Escape 1.3.2369 release.
ba7bbe6b89 WINTERMUTE: Fix typo in Polish language filename in Reversion1.
e180612ff5 WINTERMUTE: Skip Latvian language package if not selected.


Commit: a94c66f1e39d724d06dd8ae07faf54a660db2b67
    https://github.com/scummvm/scummvm/commit/a94c66f1e39d724d06dd8ae07faf54a660db2b67
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-12-05T07:26:44-08:00

Commit Message:
COMMON: Fix order of languages.

These are sorted according to the alphabetical order of the description. Thus,
Croatian should be between Chinese (Taiwan) and Czech.

Changed paths:
    common/language.cpp
    common/language.h



diff --git a/common/language.cpp b/common/language.cpp
index 898adf8..7b5b7f0 100644
--- a/common/language.cpp
+++ b/common/language.cpp
@@ -28,6 +28,7 @@ namespace Common {
 const LanguageDescription g_languages[] = {
 	{ "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 },
 	{    "nl", "nl_NL", "Dutch", NL_NLD },
 	{    "en",    "en", "English", EN_ANY }, // Generic English (when only one game version exist)
@@ -38,7 +39,6 @@ const LanguageDescription g_languages[] = {
 	{    "gr", "el_GR", "Greek", GR_GRE },
 	{    "he", "he_IL", "Hebrew", HE_ISR },
 	{    "hb", "he_IL", "Hebrew", HE_ISR }, // Deprecated
-	{    "hr", "hr_HR", "Croatian", HR_HRV },
 	{    "hu", "hu_HU", "Hungarian", HU_HUN },
 	{    "it", "it_IT", "Italian", IT_ITA },
 	{    "jp", "ja_JP", "Japanese", JA_JPN },
diff --git a/common/language.h b/common/language.h
index 03b9eba..aacd30d 100644
--- a/common/language.h
+++ b/common/language.h
@@ -34,6 +34,7 @@ class String;
 enum Language {
 	ZH_CNA,
 	ZH_TWN,
+	HR_HRV,
 	CZ_CZE,
 	NL_NLD,
 	EN_ANY,     // Generic English (when only one game version exist)
@@ -43,7 +44,6 @@ enum Language {
 	DE_DEU,
 	GR_GRE,
 	HE_ISR,
-	HR_HRV,
 	HU_HUN,
 	IT_ITA,
 	JA_JPN,


Commit: df07a4655b84f0fccf58c89766dc39dd4f5ff298
    https://github.com/scummvm/scummvm/commit/df07a4655b84f0fccf58c89766dc39dd4f5ff298
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-12-05T07:26:44-08:00

Commit Message:
COMMON: Add Latvian language code.

Changed paths:
    common/language.cpp
    common/language.h



diff --git a/common/language.cpp b/common/language.cpp
index 7b5b7f0..6704a52 100644
--- a/common/language.cpp
+++ b/common/language.cpp
@@ -43,6 +43,7 @@ const LanguageDescription g_languages[] = {
 	{    "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\xE5l", NB_NOR }, // TODO Someone should verify the unix locale
 	{    "pl", "pl_PL", "Polish", PL_POL },
 	{    "br", "pt_BR", "Portuguese", PT_BRA },
diff --git a/common/language.h b/common/language.h
index aacd30d..f188155 100644
--- a/common/language.h
+++ b/common/language.h
@@ -48,6 +48,7 @@ enum Language {
 	IT_ITA,
 	JA_JPN,
 	KO_KOR,
+	LV_LAT,
 	NB_NOR,
 	PL_POL,
 	PT_BRA,


Commit: dce90064b9b2985b8c6f92c4c83577390dd9fe69
    https://github.com/scummvm/scummvm/commit/dce90064b9b2985b8c6f92c4c83577390dd9fe69
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-12-05T07:26:44-08:00

Commit Message:
WINTERMUTE: Add Reversion: The Escape 1.3.2369 release.

This release has different hashes and file sizes than the previous Reversion
1.3 entries but is marked as 1.3.2369 in the installer filename.

Changed paths:
    engines/wintermute/detection_tables.h



diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 46e05f2..bec52c4 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -689,6 +689,118 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
+	// Reversion: The Escape Version 1.3.2369 (Chinese)
+	{
+		"reversion1",
+		"Version 1.3.2369",
+		{
+			{"xlanguage_nz.dcp", 0, "7146dfa43ffdf0886e034fffe2c8a0c0", 13722261},
+			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+			AD_LISTEND
+		},
+		Common::ZH_CNA,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Reversion: The Escape Version 1.3.2369 (English)
+	{
+		"reversion1",
+		"Version 1.3.2369",
+		{
+			{"xlanguage_en.dcp", 0, "64b6fa7eedc09c231f6ce046e77fee05", 11339619},
+			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+			AD_LISTEND
+		},
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Reversion: The Escape Version 1.3.2369 (French)
+	{
+		"reversion1",
+		"Version 1.3.2369",
+		{
+			{"xlanguage_fr.dcp", 0, "d561d562224afea809153a1fd9fdb0c0", 11963210},
+			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+			AD_LISTEND
+		},
+		Common::FR_FRA,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Reversion: The Escape Version 1.3.2369 (German)
+	{
+		"reversion1",
+		"Version 1.3.2369",
+		{
+			{"xlanguage_de.dcp", 0, "4e3f614c36bd6bae74b8cc83e663a8f0", 14040310},
+			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+			AD_LISTEND
+		},
+		Common::DE_DEU,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Reversion: The Escape Version 1.3.2369 (Italian)
+	{
+		"reversion1",
+		"Version 1.3.2369",
+		{
+			{"xlanguage_it.dcp", 0, "10d09b7fe61946f09dd91d5e8d090f94", 11913752},
+			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+			AD_LISTEND
+		},
+		Common::IT_ITA,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Reversion: The Escape Version 1.3.2369 (Latvian)
+	{
+		"reversion1",
+		"Version 1.3.2369",
+		{
+			{"xlanguage_lv.dcp", 0, "704359ab5040b0dab6545064d7aa6eb9", 11414925},
+			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+			AD_LISTEND
+		},
+		Common::LV_LAT,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Reversion: The Escape Version 1.3.2369 (Polish)
+	{
+		"reversion1",
+		"Version 1.3.2369",
+		{
+			{"xlanguage_pl.dcp", 0, "c4ad33f57e1e998169552d521c1d6638", 11532215},
+			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+			AD_LISTEND
+		},
+		Common::PL_POL,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Reversion: The Escape Version 1.3.2369 (Portuguese)
+	{
+		"reversion1",
+		"Version 1.3.2369",
+		{
+			{"xlanguage_pt.dcp", 0, "886886b6b14aadac844078de856799a6", 10620797},
+			{"data.dcp", 0, "aecb5deeea7b0baa871fbd0cef35a648", 254219204},
+			AD_LISTEND
+		},
+		Common::PT_BRA,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
 	// Reversion: The Meeting (Chinese)
 	{
 		"reversion2",


Commit: ba7bbe6b897db08f16a8de106df02bcadb0ec764
    https://github.com/scummvm/scummvm/commit/ba7bbe6b897db08f16a8de106df02bcadb0ec764
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-12-05T07:26:44-08:00

Commit Message:
WINTERMUTE: Fix typo in Polish language filename in Reversion1.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 286f83d..a51038b 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -247,7 +247,7 @@ bool BaseFileManager::registerPackages() {
 				} else if (_language == Common::IT_ITA && (fileName != "italian.dcp" && fileName != "xlanguage_it.dcp")) {
 					continue;
 				// Polish
-				} else if (_language == Common::PL_POL && (fileName != "polish.dcp" && fileName != "xlanguage_po.dcp")) {
+				} else if (_language == Common::PL_POL && (fileName != "polish.dcp" && fileName != "xlanguage_pl.dcp")) {
 					continue;
 				// Portuguese
 				} else if (_language == Common::PT_BRA && (fileName != "portuguese.dcp" && fileName != "xlanguage_pt.dcp")) {


Commit: e180612ff5d636b11710080f816f5e073c34d876
    https://github.com/scummvm/scummvm/commit/e180612ff5d636b11710080f816f5e073c34d876
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-12-05T07:27:57-08:00

Commit Message:
WINTERMUTE: Skip Latvian language package if not selected.

Changed paths:
    engines/wintermute/base/base_file_manager.cpp



diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index a51038b..e39a15f 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -246,6 +246,11 @@ bool BaseFileManager::registerPackages() {
 				// Italian
 				} else if (_language == Common::IT_ITA && (fileName != "italian.dcp" && fileName != "xlanguage_it.dcp")) {
 					continue;
+				// Latvian
+				} else if (_language == Common::LV_LAT && (fileName != "latvian.dcp" && fileName != "xlanguage_lv.dcp")) {
+					// TODO: 'latvian.dcp' is just guesswork. Is there any
+					// game using Latvian and using this filename?
+					continue;
 				// Polish
 				} else if (_language == Common::PL_POL && (fileName != "polish.dcp" && fileName != "xlanguage_pl.dcp")) {
 					continue;






More information about the Scummvm-git-logs mailing list