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

athrxx noreply at scummvm.org
Sun May 14 17:39:19 UTC 2023


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:
8659f39224 KYRA: Support for official Polish HoF translation (floppy version)
af0f874c6e KYRA: Typo fix in k2SeqplayStringsDOSPolish array


Commit: 8659f3922421026d0a167d8f46285be4ef0af858
    https://github.com/scummvm/scummvm/commit/8659f3922421026d0a167d8f46285be4ef0af858
Author: leloch (leloch at users.noreply.github.com)
Date: 2023-05-14T19:39:15+02:00

Commit Message:
KYRA: Support for official Polish HoF translation (floppy version)

Fixes #7666

Changed paths:
  A devtools/create_kyradat/resources/hof_dos_polish.h
    devtools/create_kyradat/create_kyradat.cpp
    devtools/create_kyradat/games.cpp
    devtools/create_kyradat/resources.cpp
    dists/engine-data/kyra.dat
    engines/kyra/detection_tables.h
    engines/kyra/engine/kyra_v2.cpp
    engines/kyra/resource/staticres.cpp


diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index 1984eedd5e9..af0e268f2b8 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -38,7 +38,7 @@
 
 
 enum {
-	kKyraDatVersion = 121
+	kKyraDatVersion = 122
 };
 
 const ExtractFilename extractFilenames[] = {
@@ -1210,6 +1210,7 @@ const TypeTable languageTable[] = {
 	{ ZH_TWN, 10 },
 	{ KO_KOR, 11 },
 	{ CS_CZE, 12 },
+	{ PL_POL, 13 },
 	{ -1, -1 }
 };
 
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index a64df300f34..643ef516f6c 100644
--- a/devtools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
@@ -85,6 +85,7 @@ const Game kyra2Games[] = {
 	{ kKyra2, kPlatformDOS, kNoSpecial, RU_RUS },
 	{ kKyra2, kPlatformDOS, kNoSpecial, ES_ESP },
 	{ kKyra2, kPlatformDOS, kNoSpecial, ZH_TWN },
+	{ kKyra2, kPlatformDOS, kNoSpecial, PL_POL },
 
 	{ kKyra2, kPlatformDOS, kTalkieVersion, EN_ANY },
 	{ kKyra2, kPlatformDOS, kTalkieVersion, FR_FRA },
diff --git a/devtools/create_kyradat/resources.cpp b/devtools/create_kyradat/resources.cpp
index 72515baf4cb..4eb076c58e0 100644
--- a/devtools/create_kyradat/resources.cpp
+++ b/devtools/create_kyradat/resources.cpp
@@ -81,6 +81,7 @@
 #include "resources/hof_dos_russian.h"
 #include "resources/hof_dos_spanish.h"
 #include "resources/hof_dos_chinese_trad.h"
+#include "resources/hof_dos_polish.h"
 
 #include "resources/hof_dos_cddemo.h"
 #include "resources/hof_dos_cddemo_english.h"
@@ -1303,6 +1304,7 @@ static const ResourceProvider resourceProviders[] = {
 	{ k2IngameTlkDemoStrings, kKyra2, kPlatformDOS, kTalkieDemoVersion, DE_DEU, &k2IngameTlkDemoStringsDOSCDDemoGermanProvider },
 	{ k2SeqplayPakFiles, kKyra2, kPlatformDOS, kNoSpecial, UNK_LANG, &k2SeqplayPakFilesDOSProvider },
 	{ k2SeqplayStrings, kKyra2, kPlatformDOS, kNoSpecial, EN_ANY, &k2SeqplayStringsDOSEnglishProvider },
+	{ k2SeqplayStrings, kKyra2, kPlatformDOS, kNoSpecial, PL_POL, &k2SeqplayStringsDOSPolishProvider },
 	{ k2SeqplaySfxFiles, kKyra2, kPlatformDOS, kNoSpecial, UNK_LANG, &k2SeqplaySfxFilesDOSProvider },
 	{ k2SeqplayIntroTracks, kKyra2, kPlatformDOS, kNoSpecial, UNK_LANG, &k2SeqplayIntroTracksDOSProvider },
 	{ k2SeqplayFinaleTracks, kKyra2, kPlatformDOS, kNoSpecial, UNK_LANG, &k2SeqplayFinaleTracksDOSProvider },
@@ -1376,6 +1378,7 @@ static const ResourceProvider resourceProviders[] = {
 	{ k2FontData, kKyra2, kPlatformDOS, kNoSpecial, IT_ITA, &k2FontDataDOSDummyProvider },
 	{ k2FontData, kKyra2, kPlatformDOS, kNoSpecial, ES_ESP, &k2FontDataDOSDummyProvider },
 	{ k2FontData, kKyra2, kPlatformDOS, kNoSpecial, RU_RUS, &k2FontDataDOSDummyProvider },
+	{ k2FontData, kKyra2, kPlatformDOS, kNoSpecial, PL_POL, &k2FontDataDOSDummyProvider },
 	{ k2FontData, kKyra2, kPlatformDOS, kNoSpecial, ZH_TWN, &k2FontDataDOSChineseTradProvider },
 	{ k3MainMenuStrings, kKyra3, kPlatformDOS, kTalkieVersion, EN_ANY, &k3MainMenuStringsDOSCDEnglishProvider },
 	{ k3MainMenuStrings, kKyra3, kPlatformDOS, kTalkieVersion, FR_FRA, &k3MainMenuStringsDOSCDFrenchProvider },
diff --git a/devtools/create_kyradat/resources/hof_dos_polish.h b/devtools/create_kyradat/resources/hof_dos_polish.h
new file mode 100644
index 00000000000..5593008e271
--- /dev/null
+++ b/devtools/create_kyradat/resources/hof_dos_polish.h
@@ -0,0 +1,108 @@
+static const char *const k2SeqplayStringsDOSPolish[103] = {
+    "Kyrandia znika!",
+    "Ska""\x88""a po skale...",
+    "...i drzewo po drzewie.",
+    "Kyrandia przestaje istnie""\x86""!",
+    "Kr""\xA2""lewscy Mistycy s""\xA5"" zbici z tropu.",
+    "Zbadano ka""\xBE""de przes""\x88""anki.",
+    "Na konferencj""\xA9"" zaproszono nawet Marka wraz ze sw""\xA5"" now""\xA5"" przyjaci""\xA2""""\x88""k""\xA5"", R""\xA9""k""\xA5"".",
+    "Na szcz""\xA9""""\x98""cie, R""\xA9""ka mia""\x88""a do""\x98""wiadczenie w tych sprawach,",
+    "I w ko""\xE4""cu plan zosta""\x88"" zatwierdzony.",
+    "Wymaga""\x88"" on zdobycia magicznego kamienia...",
+    "...znajduj""\xA5""cego si""\xA9"" w centrum ""\x98""wiata.",
+    "Zanthia, najm""\x88""odsza z mistyk""\xA2""w Kyrnadii, zosta""\x88""a wybrana do tego zadania.",
+    "Dzi""\xA9""kujemy za granie w Hand of Fate.",
+    "Powinno wystarczy""\x86"" jag""\xA2""d, by otworzy""\x86"" magiczne przej""\x98""cie do centrum ""\x98""wiata.",
+	" DUMMY STRING... ",
+	" DUMMY STRING... ",
+    "Hej! Ukradziono wszystkie moje rzeczy!",
+	" DUMMY STRING... ",
+    "Je""\xBE""eli Rada s""\xA5""dzi, ""\xBE""e p""\xA2""jd""\xA9"" tam pieszo, to si""\xA9"" grubo myli!",
+	" DUMMY STRING... ",
+	" DUMMY STRING... ",
+    "Pospiesz si""\xA9"" Faun!",
+    "O rany, ma""\x88""o brakowa""\x88""o!",
+    "Masz racj""\xA9"", bracie. Ja ju""\xBE"" nie zamierzam wi""\xA9""cej polowa""\x86""!",
+    "Kraaa.",
+    "Ile razy mam Ci powtarza""\x86"", ""\xBE""e jeste""\x98"" ropuch""\xA5""?",
+    "Ojej! Ser nam si""\xA9"" sko""\xE4""czy""\x88""!",
+    "Spr""\xA2""bujmy tego miodu z uszu. Jest ""\xBE""""\xA2""""\x88""ty.",
+    "Mamo, kiedy dostan""\xA9"" mleczko?",
+    "Sio! Wynocha!",
+    "Ty tniesz, a ja wybieram.",
+    "Nie. To ty tniesz, a ja wybieram.",
+    "Dalej s""\xA5""dz""\xA9"", ""\xBE""e to by""\x88""y rymy cz""\xA9""stochowskie.",
+    "Och, nie rozpozna""\x88""by""\x98"" czterowiersza nawet gdybym Ci""\xA9"" ugryz""\x88"" w ty""\x88""ek!",
+    "Producent",
+    "Brett W. Sperry",
+    "Projekt i re""\xBE""yseria",
+    "Rick Gush",
+    "Programowanie",
+    "Michael Legg",
+    "Opracowanie artystyczne",
+    "Louis Castle",
+    "Joseph B. Hewitt IV",
+    "G""\x88""""\xA2""wny artysta",
+    "Rick Parks",
+    "Dodatkowe kodowanie",
+    "Philip W. Gorrow",
+    "Matt Collins",
+    "Mark McCubbin",
+    "Arty""\x98""ci",
+    "Cameron Chun",
+    "Cary Averett",
+    "Cindy Chinn",
+    "Elie Arabian",
+    "Fei Cheng",
+    "Ferby Miguel",
+    "Frank Mendeola",
+    "Jack Martin",
+    "Jerry Moore",
+    "",
+    "Judith Peterson",
+    "Larry Miller",
+    "Lenny Lee",
+    "Louise Sandoval",
+    "Ren Olsen",
+    "Muzyka i d""\xAB""wi""\xA9""ki",
+    "Paul Mudra",
+    "Frank Klepacki",
+    "Dwight Okahara",
+    "Pat Collins",
+    "Poprawa jako""\x98""ci",
+    "Glenn Sperry",
+    "Michael Lightner",
+    "William Foster",
+    "Jesse Clemit",
+    "Jeff Fillhaber",
+    "Podr""\xA9""cznik, opakowanie",
+    "i instrukcja.",
+    "Eydie Laramore",
+    "Lisa Marcinko",
+    "Lauren Rifkin",
+    "Gratulacje!",
+    "Dzi""\xA9""kujemy za granie w Hand of Fate!",
+    "Go""\x98""cinne kodowanie",
+    "Wsp""\xA2""""\x88""praca",
+    "Scott Duckett",
+    "Testerzy",
+    "Chris McFarland",
+    "Paul Moore",
+    "Chad Soares",
+    "Jared Brinkley",
+    "Jon Willliams",
+    "Chris Toft",
+    "T""\x88""umaczenie",
+    "Jacek Zadr""\xA5""g, Marcin Kretowicz, Pawe""\x88"" Cybulski",
+    "Za""\x88""aduj gr""\xA9""",
+    "Wprowadzenie",
+    "Nowa gra",
+    "Zako""\xE4""cz gr""\xA9""",
+    "Specjalne podzi""\xA9""kowania dla",
+    "MIPS Computer Group",
+    "Tim Fritz",
+    "Kenny Dunne"
+};
+
+static const StringListProvider k2SeqplayStringsDOSPolishProvider = { ARRAYSIZE(k2SeqplayStringsDOSPolish), k2SeqplayStringsDOSPolish };
+
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index 03357523d38..f14d95d1967 100644
Binary files a/dists/engine-data/kyra.dat and b/dists/engine-data/kyra.dat differ
diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 9219b43556b..03d89ccb93c 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -677,14 +677,14 @@ const KYRAGameDescription adGameDescs[] = {
 		KYRA2_FLOPPY_FLAGS
 	},
 
-	{ // Floppy version extracted. Bugreport #7666
+	{ // Floppy version extracted
 		{
 			"kyra2",
-			msg_fanTrans_missingLangResources, // Reason for being unsupported
+			"Extracted",
 			AD_ENTRY1s("FATE.PAK", "ac81bcd4aa6e0921a87eb099827a8b06", 107309),
 			Common::PL_POL,
 			Common::kPlatformDOS,
-			ADGF_UNSUPPORTED,
+			ADGF_NO_FLAGS,
 			GUIO6(GUIO_NOSPEECH, GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
 		},
 		KYRA2_FLOPPY_FLAGS
diff --git a/engines/kyra/engine/kyra_v2.cpp b/engines/kyra/engine/kyra_v2.cpp
index 2192cdc29b1..d6ef7eafe31 100644
--- a/engines/kyra/engine/kyra_v2.cpp
+++ b/engines/kyra/engine/kyra_v2.cpp
@@ -110,6 +110,10 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags, const Engi
 		_lang = 3;
 		break;
 
+	case Common::PL_POL:
+		_lang = 4;
+		break;
+
 	default:
 		warning("unsupported language, switching back to English");
 		_lang = 0;
diff --git a/engines/kyra/resource/staticres.cpp b/engines/kyra/resource/staticres.cpp
index 5424554ee5c..4b796678311 100644
--- a/engines/kyra/resource/staticres.cpp
+++ b/engines/kyra/resource/staticres.cpp
@@ -38,7 +38,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 121
+#define RESFILE_VERSION 122
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
@@ -98,6 +98,7 @@ const IndexTable iLanguageTable[] = {
 	{ Common::ZH_TWN, 10 },
 	{ Common::KO_KOR, 11 },
 	{ Common::CS_CZE, 12 },
+	{ Common::PL_POL, 13 },
 	{ -1, -1 }
 };
 
@@ -1506,6 +1507,7 @@ const char *const KyraEngine_HoF::_languageExtension[] = {
 	"ITA",      Italian and Spanish were never included
 	"SPA"*/
 	"JPN",
+	"POL"
 };
 
 const char *const KyraEngine_HoF::_scriptLangExt[] = {


Commit: af0f874c6e9bb7e95cd6b4bc9d052d3443d913f7
    https://github.com/scummvm/scummvm/commit/af0f874c6e9bb7e95cd6b4bc9d052d3443d913f7
Author: leloch (leloch at users.noreply.github.com)
Date: 2023-05-14T19:39:15+02:00

Commit Message:
KYRA: Typo fix in k2SeqplayStringsDOSPolish array

Changed paths:
    devtools/create_kyradat/resources/hof_dos_polish.h


diff --git a/devtools/create_kyradat/resources/hof_dos_polish.h b/devtools/create_kyradat/resources/hof_dos_polish.h
index 5593008e271..5a75b995e06 100644
--- a/devtools/create_kyradat/resources/hof_dos_polish.h
+++ b/devtools/create_kyradat/resources/hof_dos_polish.h
@@ -99,7 +99,7 @@ static const char *const k2SeqplayStringsDOSPolish[103] = {
     "Nowa gra",
     "Zako""\xE4""cz gr""\xA9""",
     "Specjalne podzi""\xA9""kowania dla",
-    "MIPS Computer Group",
+    "IPS Computer Group",
     "Tim Fritz",
     "Kenny Dunne"
 };




More information about the Scummvm-git-logs mailing list