[Scummvm-git-logs] scummvm master -> 82aaf4262c7e38c1efcaab8244a15214eab4bcee

[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:
6760fceb72 COMMON:: LUA: Added Chroatian language used in Sword25
82aaf4262c SWORD25: Fixed language selection in the extracted version


Commit: 6760fceb72e33aefbc28a2ffc0f17378b6083a60
    https://github.com/scummvm/scummvm/commit/6760fceb72e33aefbc28a2ffc0f17378b6083a60
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-07T12:25:08+02:00

Commit Message:
COMMON:: LUA: Added Chroatian language used in Sword25

Changed paths:
    common/lua/scummvm_file.cpp


diff --git a/common/lua/scummvm_file.cpp b/common/lua/scummvm_file.cpp
index f1ffb1ce0b..78fae692b2 100644
--- a/common/lua/scummvm_file.cpp
+++ b/common/lua/scummvm_file.cpp
@@ -185,6 +185,8 @@ Common::String LuaFileConfig::getLanguage() {
 		return "es";
 	case Common::FR_FRA:
 		return "fr";
+	case Common::HR_HRV:
+		return "hr";
 	case Common::HU_HUN:
 		return "hu";
 	case Common::IT_ITA:
@@ -213,6 +215,8 @@ void LuaFileConfig::setLanguage(const Common::String &lang) {
 		ConfMan.set("language", Common::getLanguageCode(Common::ES_ESP));
 	else if (lang == "fr")
 		ConfMan.set("language", Common::getLanguageCode(Common::FR_FRA));
+	else if (lang == "hr")
+		ConfMan.set("language", Common::getLanguageCode(Common::HR_HRV));
 	else if (lang == "hu")
 		ConfMan.set("language", Common::getLanguageCode(Common::HU_HUN));
 	else if (lang == "it")
@@ -224,7 +228,7 @@ void LuaFileConfig::setLanguage(const Common::String &lang) {
 	else if (lang == "ru")
 		ConfMan.set("language", Common::getLanguageCode(Common::RU_RUS));
 	else
-		error("Unknown language encountered");
+		error("Unknown language encountered: %s", lang.c_str());
 }
 
 


Commit: 82aaf4262c7e38c1efcaab8244a15214eab4bcee
    https://github.com/scummvm/scummvm/commit/82aaf4262c7e38c1efcaab8244a15214eab4bcee
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-07T12:28:16+02:00

Commit Message:
SWORD25: Fixed language selection in the extracted version

Changed paths:
    engines/sword25/detection_tables.h


diff --git a/engines/sword25/detection_tables.h b/engines/sword25/detection_tables.h
index 927060bf18..f7bede7f43 100644
--- a/engines/sword25/detection_tables.h
+++ b/engines/sword25/detection_tables.h
@@ -124,7 +124,7 @@ static const ADGameDescription gameDescriptions[] = {
 		 {"boot.lua", 0, 0, -1},
 		 {"kernel.lua", 0, 0, -1},
 		 AD_LISTEND},
-		Common::EN_ANY,
+		Common::UNK_LANG,
 		Common::kPlatformUnknown,
 		GF_EXTRACTED | ADGF_NO_FLAGS,
 		GUIO1(GUIO_NOASPECT)