[Scummvm-git-logs] scummvm master -> e2d8955e1ea8cb2db8201d6e64395526667d3fb6
athrxx
athrxx at scummvm.org
Tue Jun 2 18:50:09 UTC 2020
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f477753f69 KYRA:LOK Spanish CD fan made version - hash file detection
5b660fe8ae KYRA:LOK Spanish CD fan made version - add resources
d452b37312 KYRA:LOK Spanish CD fan made version - French based version functionality
975ec7b120 KYRA: fix nullptr dereference
e81a38698d KYRA: (KYRA1/Spanish CD fan translation) - update Kyra.dat
e2d8955e1e NEWS: update with new Spanish KYRA games
Commit: f477753f69fc5c73c96c4a523b63c0bec6fd41cf
https://github.com/scummvm/scummvm/commit/f477753f69fc5c73c96c4a523b63c0bec6fd41cf
Author: Asirome (mekkon at tutanota.com)
Date: 2020-06-02T20:43:27+02:00
Commit Message:
KYRA:LOK Spanish CD fan made version - hash file detection
Changed paths:
engines/kyra/detection_tables.h
diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 6d0c13687e..b23960f1fe 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -367,6 +367,19 @@ const KYRAGameDescription adGameDescs[] = {
KYRA1_CD_FLAGS
},
+ { // Spanish fan translation
+ {
+ "kyra1",
+ "CD",
+ AD_ENTRY1("GEMCUT.PAK", "d9fb36376939f3d31ec2c3746ff6da1b"),
+ Common::ES_ESP,
+ Common::kPlatformDOS,
+ ADGF_CD,
+ GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIPCSPK, GUIO_RENDERVGA)
+ },
+ KYRA1_CD_FLAGS
+ },
+
{ // Kyra 1 Mac CD as mentioned in fr #2766454 "KYRA1: Add support for Macintosh CD" by nnooiissee
{
"kyra1",
Commit: 5b660fe8aece110843ba8b170fd1e1cb38c5fa5e
https://github.com/scummvm/scummvm/commit/5b660fe8aece110843ba8b170fd1e1cb38c5fa5e
Author: Asirome (mekkon at tutanota.com)
Date: 2020-06-02T20:43:27+02:00
Commit Message:
KYRA:LOK Spanish CD fan made version - add resources
Changed paths:
A devtools/create_kyradat/resources/lok_dos_cd_spanish.h
devtools/create_kyradat/games.cpp
devtools/create_kyradat/resources.cpp
diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp
index a7599a5f52..9a79934797 100644
--- a/devtools/create_kyradat/games.cpp
+++ b/devtools/create_kyradat/games.cpp
@@ -49,6 +49,7 @@ const Game kyra1Games[] = {
{ kKyra1, kPlatformDOS, kTalkieVersion, DE_DEU },
{ kKyra1, kPlatformDOS, kTalkieVersion, FR_FRA },
{ kKyra1, kPlatformDOS, kTalkieVersion, IT_ITA },
+ { kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP },
{ kKyra1, kPlatformFMTowns, kNoSpecial, EN_ANY },
{ kKyra1, kPlatformFMTowns, kNoSpecial, JA_JPN },
diff --git a/devtools/create_kyradat/resources.cpp b/devtools/create_kyradat/resources.cpp
index afdbcd5d17..b8e23bd023 100644
--- a/devtools/create_kyradat/resources.cpp
+++ b/devtools/create_kyradat/resources.cpp
@@ -45,6 +45,7 @@
#include "resources/lok_dos_cd_french.h"
#include "resources/lok_dos_cd_german.h"
#include "resources/lok_dos_cd_italian.h"
+#include "resources/lok_dos_cd_spanish.h"
#include "resources/lok_dos_cddemo.h"
#include "resources/lok_dos_cddemo_english.h"
@@ -640,6 +641,28 @@ static const ResourceProvider resourceProviders[] = {
{ k1GUIStrings, kKyra1, kPlatformDOS, kTalkieVersion, IT_ITA, &k1GUIStringsDOSCDItalianProvider },
{ k1NewGameString, kKyra1, kPlatformDOS, kTalkieVersion, IT_ITA, &k1NewGameStringDOSCDItalianProvider },
{ k1ConfigStrings, kKyra1, kPlatformDOS, kTalkieVersion, IT_ITA, &k1ConfigStringsDOSCDItalianProvider },
+ { k1IntroStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1IntroStringsDOSCDSpanishProvider },
+ { k1ItemNames, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1ItemNamesDOSCDSpanishProvider },
+ { k1TakenStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1TakenStringsDOSCDSpanishProvider },
+ { k1PlacedStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1PlacedStringsDOSCDSpanishProvider },
+ { k1DroppedStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1DroppedStringsDOSCDSpanishProvider },
+ { k1NoDropStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1NoDropStringsDOSCDSpanishProvider },
+ { k1PutDownString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1PutDownStringDOSCDSpanishProvider },
+ { k1WaitAmuletString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1WaitAmuletStringDOSCDSpanishProvider },
+ { k1BlackJewelString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1BlackJewelStringDOSCDSpanishProvider },
+ { k1HealingTipString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1HealingTipStringDOSCDSpanishProvider },
+ { k1PoisonGoneString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1PoisonGoneStringDOSCDSpanishProvider },
+ { k1ThePoisonStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1ThePoisonStringsDOSCDSpanishProvider },
+ { k1FluteStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1FluteStringsDOSCDSpanishProvider },
+ { k1WispJewelStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1WispJewelStringsDOSCDSpanishProvider },
+ { k1MagicJewelStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1MagicJewelStringsDOSCDSpanishProvider },
+ { k1FlaskFullString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1FlaskFullStringDOSCDSpanishProvider },
+ { k1FullFlaskString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1FullFlaskStringDOSCDSpanishProvider },
+ { k1OutroHomeString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1OutroHomeStringDOSCDSpanishProvider },
+ { k1VeryCleverString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1VeryCleverStringDOSCDSpanishProvider },
+ { k1GUIStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1GUIStringsDOSCDSpanishProvider },
+ { k1NewGameString, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1NewGameStringDOSCDSpanishProvider },
+ { k1ConfigStrings, kKyra1, kPlatformDOS, kTalkieVersion, ES_ESP, &k1ConfigStringsDOSCDSpanishProvider },
{ k1KallakWritingSeq, kKyra1, kPlatformFMTowns, kNoSpecial, UNK_LANG, &k1KallakWritingSeqFMTownsProvider },
{ k1MalcolmTreeSeq, kKyra1, kPlatformFMTowns, kNoSpecial, UNK_LANG, &k1MalcolmTreeSeqFMTownsProvider },
{ k1WestwoodLogoSeq, kKyra1, kPlatformFMTowns, kNoSpecial, UNK_LANG, &k1WestwoodLogoSeqFMTownsProvider },
diff --git a/devtools/create_kyradat/resources/lok_dos_cd_spanish.h b/devtools/create_kyradat/resources/lok_dos_cd_spanish.h
new file mode 100644
index 0000000000..cffd6c7d6b
--- /dev/null
+++ b/devtools/create_kyradat/resources/lok_dos_cd_spanish.h
@@ -0,0 +1,381 @@
+static const char *const k1IntroStringsDOSCDSpanish[51] = {
+ "This is a text test - 1",
+ "This is a text test - 2",
+ "Buenas Kallak...",
+ "...""\xAD""Poderoso jefe de la Orden de los M""\xA1""sticos reales!",
+ "\xA8""Te he asustado?",
+ "\xAD""Malcolm!",
+ "Me enter""\x82"" ayer de tu fuga.",
+ "Y te estaba esperando desde hace un rato.",
+ "\xA8""Por qu""\x82"" me iba a dar prisa?",
+ "\xAD""Soy yo el que gobierna este pa""\xA1""s!",
+ "Tu d""\x82""bil maleficio no me atemoriza.",
+ "\xAD""Anda, m""\xA0""tame de una vez!",
+ "Me queda poco poder m""\xA0""gico.",
+ "No te quepa ninguna duda de que vengo a hacerte da""\xA4""o...",
+ "...Ahora eres de piedra...",
+ "...pero he respetado tus ojos.",
+ "No he derramado ni una l""\xA0""grima por Kyrandia...",
+ "...pero no voy a negarte el placer de las tuyas.",
+ "\xAD""Malcolm el Buf""\xA2""n est""\xA0"" en libertad!",
+ "Y es ""\x82""l quien ahora controla la Kyragema...",
+ "...fuente de toda la magia de Kyrandia!",
+ "",
+ "\xAD""C""\xA2""mo te atreves a tropezar conmigo!",
+ "En absoluto, he reservado algo especial para ti...",
+ "\xAD""Un hechizo humor""\xA1""stico!",
+ "Pero te advertir""\x82"" honestamente.",
+ "\xAD""No saltes a ESE ""\xA0""rbol!",
+ "\xAD""No te subas a ESE ""\xA0""rbol ardillita!",
+ "\xAD""Buuu!",
+ "Es requete divertido de este modo...",
+ "...""\xA8""Verdad?",
+ "Ja ja ja...",
+ "\xA8""Verdad que los dedos son una maravilla?",
+ "\xAD""Es estupendo estar vivo!",
+ "\xAD""Brandon!",
+ "\xAD""Abuelo! ""\xAD""Lo hemos conseguido!",
+ "\xAD""No! ""\xAD""TU lo has hecho!",
+ "\xAD""Larga vida al rey Brandon!",
+ "\xAD""Larga vida a los M""\xA1""sticos reales!",
+ "\xAD""Ahora vamos a reconstruir Kyrandia!",
+ "\xAD""Buena idea!",
+ "En mi primera proclamaci""\xA2""n como rey...",
+ "\xAD""Declaro las sandalias como calzado oficial de Kyrandia!",
+ "\xAD""Bien hecho, Brandon!",
+ "La Tierra no sufre m""\xA0""s...",
+ "\xAD""Y tus amigos han regresado!",
+ "Querida Brynn...",
+ "\xAD""Malcolm se ha fugado!",
+ "Pronto vendr""\xA0"" a por m""\xA1"".",
+ "Por favor, ayuda a Brandon...",
+ ""
+};
+
+static const StringListProvider k1IntroStringsDOSCDSpanishProvider = { ARRAYSIZE(k1IntroStringsDOSCDSpanish), k1IntroStringsDOSCDSpanish };
+
+static const char *const k1ItemNamesDOSCDSpanish[107] = {
+ "Granate",
+ "Amatista",
+ "Aguamarina",
+ "Diamante",
+ "Esmeralda",
+ "Perla",
+ "Rub""\xA1",
+ "Peridot",
+ "Zafiro",
+ "Opalo",
+ "Topacio",
+ "Onix",
+ "Piedra Solar",
+ "Piedra Lunar",
+ "Piedra Arco Iris",
+ "Piedra Magn""\x82""tica",
+ "Rosa",
+ "Tulip""\xA0""n",
+ "Orqu""\xA1""dea",
+ "Rosa de plata",
+ "Estatua de plata",
+ "Moneda de Plata",
+ "Moneda de oro",
+ "Anillo de oro",
+ "C""\xA0""liz real",
+ "Pi""\xA4""a pi""\xA4""onera",
+ "Bellota",
+ "Nuez",
+ "Fogofrutas brillantes",
+ "Fogofrutas",
+ "Fogofrutas",
+ "Fogofrutas",
+ "Fogofrutas",
+ "Fogofrutas",
+ "Pescado",
+ "Espina de pescado",
+ "Pierna de Cordero",
+ "Hueso",
+ "Manzana",
+ "Coraz""\xA2""n de Manzana",
+ "Ar""\xA0""ndanos",
+ "Champi""\xA4\xA2""n",
+ "Nota",
+ "Canica",
+ "Serrucho",
+ "Cruz de vida",
+ "Pluma",
+ "Huevo",
+ "Hoja",
+ "Tr""\x82""bol",
+ "Estrella Ca""\xA1""da",
+ "Bola de cristal",
+ "L""\xA0""grima",
+ "Espejo",
+ "Trozo de hielo",
+ "Flauta",
+ "Reloj de arena",
+ "Llave de hierro",
+ "Llave de jade",
+ "Llave de obsidiana",
+ "Poci""\xA2""n roja",
+ "Poci""\xA2""n roja",
+ "Poci""\xA2""n azul",
+ "Poci""\xA2""n azul",
+ "Poci""\xA2""n amarilla",
+ "Poci""\xA2""n amarilla",
+ "Poci""\xA2""n verde",
+ "Poci""\xA2""n naranja",
+ "Poci""\xA2""n morada",
+ "Poci""\xA2""n Arco Iris",
+ "Agua fresca",
+ "Agua fresca",
+ "Agua salada",
+ "Agua salada",
+ "Agua mineral",
+ "Agua mineral",
+ "Agua m""\xA0""gica",
+ "Agua m""\xA0""gica",
+ "Frasco vac""\xA1""o",
+ "Frasco vac""\xA1""o",
+ "Pergamino",
+ "Pergamino",
+ "Pergamino",
+ "Pergamino",
+ "Pergamino",
+ "Pergamino",
+ "Pergamino",
+ "Pergamino",
+ "Pergamino",
+ "Pergamino",
+ "Pedazo de pergamino",
+ "Pedazo de pergamino",
+ "Pedazo de pergamino",
+ "Pedazo de pergamino",
+ "Pedazo de pergamino",
+ "Piedra m""\xA0""gica roja",
+ "Piedra m""\xA0""gica naranja",
+ "Piedra m""\xA0""gica amarilla",
+ "Piedra m""\xA0""gica verde",
+ "Piedra m""\xA0""gica turquesa",
+ "Piedra m""\xA0""gica azul",
+ "Piedra m""\xA0""gica morada",
+ "Roca pesada",
+ "Corona real",
+ "Cetro real",
+ "Llave de oro",
+ "Objeto desconocido"
+};
+
+static const StringListProvider k1ItemNamesDOSCDSpanishProvider = { ARRAYSIZE(k1ItemNamesDOSCDSpanish), k1ItemNamesDOSCDSpanish };
+
+static const char *const k1TakenStringsDOSCDSpanish[2] = {
+ " en mano.",
+ " en mano."
+};
+
+static const StringListProvider k1TakenStringsDOSCDSpanishProvider = { ARRAYSIZE(k1TakenStringsDOSCDSpanish), k1TakenStringsDOSCDSpanish };
+
+static const char *const k1PlacedStringsDOSCDSpanish[1] = {
+ " en reserva."
+};
+
+static const StringListProvider k1PlacedStringsDOSCDSpanishProvider = { ARRAYSIZE(k1PlacedStringsDOSCDSpanish), k1PlacedStringsDOSCDSpanish };
+
+static const char *const k1DroppedStringsDOSCDSpanish[1] = {
+ " fuera."
+};
+
+static const StringListProvider k1DroppedStringsDOSCDSpanishProvider = { ARRAYSIZE(k1DroppedStringsDOSCDSpanish), k1DroppedStringsDOSCDSpanish };
+
+static const char *const k1NoDropStringsDOSCDSpanish[2] = {
+ "No puedes dejar m""\xA0""s objetos aqu""\xA1"".",
+ "No puedes colocar eso ah""\xA1""."
+};
+
+static const StringListProvider k1NoDropStringsDOSCDSpanishProvider = { ARRAYSIZE(k1NoDropStringsDOSCDSpanish), k1NoDropStringsDOSCDSpanish };
+
+static const char *const k1PutDownStringDOSCDSpanish[1] = {
+ "Mejor ser""\xA0"" que deposite esto antes que nada."
+};
+
+static const StringListProvider k1PutDownStringDOSCDSpanishProvider = { ARRAYSIZE(k1PutDownStringDOSCDSpanish), k1PutDownStringDOSCDSpanish };
+
+static const char *const k1WaitAmuletStringDOSCDSpanish[1] = {
+ "Supongo que tendr""\x82"" que esperar a que mi amuleto recobre su poder."
+};
+
+static const StringListProvider k1WaitAmuletStringDOSCDSpanishProvider = { ARRAYSIZE(k1WaitAmuletStringDOSCDSpanish), k1WaitAmuletStringDOSCDSpanish };
+
+static const char *const k1BlackJewelStringDOSCDSpanish[1] = {
+ "Es una joya, pero ""\xA8""por qu""\x82"" es negra?"
+};
+
+static const StringListProvider k1BlackJewelStringDOSCDSpanishProvider = { ARRAYSIZE(k1BlackJewelStringDOSCDSpanish), k1BlackJewelStringDOSCDSpanish };
+
+static const char *const k1HealingTipStringDOSCDSpanish[1] = {
+ "Oye, esto me ser""\xA0"" ""\xA3""til si me hago da""\xA4""o."
+};
+
+static const StringListProvider k1HealingTipStringDOSCDSpanishProvider = { ARRAYSIZE(k1HealingTipStringDOSCDSpanish), k1HealingTipStringDOSCDSpanish };
+
+static const char *const k1PoisonGoneStringDOSCDSpanish[2] = {
+ "\xAD""Genial!",
+ "\xAD""Han desaparecido los efectos del veneno!"
+};
+
+static const StringListProvider k1PoisonGoneStringDOSCDSpanishProvider = { ARRAYSIZE(k1PoisonGoneStringDOSCDSpanish), k1PoisonGoneStringDOSCDSpanish };
+
+static const char *const k1ThePoisonStringsDOSCDSpanish[4] = {
+ "El veneno...",
+ "No puedo respirar...",
+ "No me siento bien...",
+ "\xAD""Esa serpiente debe ser\rvenenosa!"
+};
+
+static const StringListProvider k1ThePoisonStringsDOSCDSpanishProvider = { ARRAYSIZE(k1ThePoisonStringsDOSCDSpanish), k1ThePoisonStringsDOSCDSpanish };
+
+static const char *const k1FluteStringsDOSCDSpanish[40] = {
+ "El sonido no impresiona.",
+ "Fijo que la ""\xA3""ltima nota era alta!",
+ "\xBA",
+ "\xBA",
+ "",
+ "\x01",
+ "\x01\xB3",
+ "\xB3",
+ "\x06\x04\x08\x03\x06",
+ "\x08\x01\x01",
+ "\x02\x04",
+ "\x05\x02",
+ "\x08\x01\x01",
+ "\x11",
+ "5",
+ "Y",
+ "",
+ "",
+ "",
+ "",
+ "\x15",
+ "9",
+ "]",
+ "",
+ "",
+ "",
+ "",
+ "\x07",
+ ")",
+ "M",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "SHAPE_HORZ_REV",
+ "SHAPE_VERT_REV"
+};
+
+static const StringListProvider k1FluteStringsDOSCDSpanishProvider = { ARRAYSIZE(k1FluteStringsDOSCDSpanish), k1FluteStringsDOSCDSpanish };
+
+static const char *const k1WispJewelStringsDOSCDSpanish[2] = {
+ "Ahora no me siento con fuerzas para hacerlo.",
+ "Mejor ser""\xA0"" que deposite esto antes que nada."
+};
+
+static const StringListProvider k1WispJewelStringsDOSCDSpanishProvider = { ARRAYSIZE(k1WispJewelStringsDOSCDSpanish), k1WispJewelStringsDOSCDSpanish };
+
+static const char *const k1MagicJewelStringsDOSCDSpanish[1] = {
+ "Eso sienta raro."
+};
+
+static const StringListProvider k1MagicJewelStringsDOSCDSpanishProvider = { ARRAYSIZE(k1MagicJewelStringsDOSCDSpanish), k1MagicJewelStringsDOSCDSpanish };
+
+static const char *const k1FlaskFullStringDOSCDSpanish[1] = {
+ "Este frasco ya est""\xA0"" lleno."
+};
+
+static const StringListProvider k1FlaskFullStringDOSCDSpanishProvider = { ARRAYSIZE(k1FlaskFullStringDOSCDSpanish), k1FlaskFullStringDOSCDSpanish };
+
+static const char *const k1FullFlaskStringDOSCDSpanish[4] = {
+ "El frasco contiene agua fresca y espumosa.",
+ "El frasco contiene agua salada.",
+ "El frasco contiene agua mineral.",
+ "Agua m""\xA0""gica."
+};
+
+static const StringListProvider k1FullFlaskStringDOSCDSpanishProvider = { ARRAYSIZE(k1FullFlaskStringDOSCDSpanish), k1FullFlaskStringDOSCDSpanish };
+
+static const char *const k1OutroHomeStringDOSCDSpanish[1] = {
+ "Hogar"
+};
+
+static const StringListProvider k1OutroHomeStringDOSCDSpanishProvider = { ARRAYSIZE(k1OutroHomeStringDOSCDSpanish), k1OutroHomeStringDOSCDSpanish };
+
+static const char *const k1VeryCleverStringDOSCDSpanish[1] = {
+ "Genial! Pero el esfuerzo es en vano."
+};
+
+static const StringListProvider k1VeryCleverStringDOSCDSpanishProvider = { ARRAYSIZE(k1VeryCleverStringDOSCDSpanish), k1VeryCleverStringDOSCDSpanish };
+
+static const char *const k1GUIStringsDOSCDSpanish[35] = {
+ "The Legend of Kyrandia",
+ "Cargar un juego",
+ "Salvar este juego",
+ "Controles de juego",
+ "Abandonar el juego",
+ "Reanudar el juego",
+ "Controles de juego",
+ "\xA8""Qu""\x82"" juego deseas recargar?",
+ "Seleccionar una posici""\xA2""n para salvar:",
+ "[ RANURA VACIA ]",
+ "Abandonar",
+ "Introduce una descripci""\xA2""n de tu juego salvado.",
+ "Salvar",
+ "Descansa en paz, Brandon.",
+ "\xA8""Est""\xA0""s seguro de que deseas Abandonar el juego?",
+ "XXXXXXXXXXXXXXXXX",
+ "XXXXXXXXXXXXXXXXX",
+ "XXXXXXXXXXXXXXXXX",
+ "XXXXXXXXXXXXXXXXX",
+ "XXXXXXXXXXXX",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "Men""\xA3"" principal",
+ "on",
+ "off",
+ "S""\xA1",
+ "No",
+ "?""\x0F"")+F""\x0F"")+L""\x0F"")+T""\x0F"")+[""\x0F"")+h""\x0F"")+y""\x0F"")+""\x89\x0F"")+""\x97\x0F"")+""\x9D\x0F"")+""\xA5\x0F"")+""\xAC\x0F"")+Velocidad al paso ",
+ "Velocidad del texto",
+ "La m""\xA3""sica en ",
+ "Los sonidos en ",
+ "Voz / Texto"
+};
+
+static const StringListProvider k1GUIStringsDOSCDSpanishProvider = { ARRAYSIZE(k1GUIStringsDOSCDSpanish), k1GUIStringsDOSCDSpanish };
+
+static const char *const k1NewGameStringDOSCDSpanish[1] = {
+ "[ INICIAR UN JUEGO NUEVO ]"
+};
+
+static const StringListProvider k1NewGameStringDOSCDSpanishProvider = { ARRAYSIZE(k1NewGameStringDOSCDSpanish), k1NewGameStringDOSCDSpanish };
+
+static const char *const k1ConfigStringsDOSCDSpanish[12] = {
+ "muy lento",
+ "lento",
+ "normal",
+ "r""\xA0""pido",
+ "muy r""\xA0""pido",
+ "Texto solamente",
+ "Voces solamente",
+ "Voces y Texto",
+ "muy lento",
+ "normal",
+ "r""\xA0""pido",
+ "pulsable"
+};
+
+static const StringListProvider k1ConfigStringsDOSCDSpanishProvider = { ARRAYSIZE(k1ConfigStringsDOSCDSpanish), k1ConfigStringsDOSCDSpanish };
Commit: d452b37312d5df261898fbacad6d49fa72698dce
https://github.com/scummvm/scummvm/commit/d452b37312d5df261898fbacad6d49fa72698dce
Author: Asirome (mekkon at tutanota.com)
Date: 2020-06-02T20:43:27+02:00
Commit Message:
KYRA:LOK Spanish CD fan made version - French based version functionality
Changed paths:
engines/kyra/gui/gui_lok.cpp
engines/kyra/resource/staticres.cpp
engines/kyra/sequence/sequences_lok.cpp
diff --git a/engines/kyra/gui/gui_lok.cpp b/engines/kyra/gui/gui_lok.cpp
index b2971757ce..cdd5e2acfd 100644
--- a/engines/kyra/gui/gui_lok.cpp
+++ b/engines/kyra/gui/gui_lok.cpp
@@ -361,7 +361,7 @@ void GUI_LoK::setGUILabels() {
offset = 52;
else if (_vm->gameFlags().lang == Common::DE_DEU)
offset = 30;
- else if (_vm->gameFlags().lang == Common::FR_FRA || _vm->gameFlags().lang == Common::IT_ITA)
+ else if (_vm->gameFlags().lang == Common::FR_FRA || _vm->gameFlags().lang == Common::IT_ITA || _vm->gameFlags().lang == Common::ES_ESP)
offset = 6;
offsetOn = offsetMainMenu = offsetOptions = offset;
walkspeedGarbageOffset = 48;
diff --git a/engines/kyra/resource/staticres.cpp b/engines/kyra/resource/staticres.cpp
index dd86976a51..a127d317a4 100644
--- a/engines/kyra/resource/staticres.cpp
+++ b/engines/kyra/resource/staticres.cpp
@@ -952,7 +952,7 @@ void KyraEngine_LoK::loadMainScreen(int page) {
_screen->loadBitmap("MAIN15.CPS", page, page, &_screen->getPalette(0));
else if (_flags.lang == Common::EN_ANY || _flags.lang == Common::JA_JPN || (_flags.isTalkie && _flags.lang == Common::IT_ITA))
_screen->loadBitmap("MAIN_ENG.CPS", page, page, 0);
- else if (_flags.lang == Common::FR_FRA)
+ else if (_flags.lang == Common::FR_FRA || (_flags.lang == Common::ES_ESP && _flags.isTalkie) /* Spanish fan made over French CD version */ )
_screen->loadBitmap("MAIN_FRE.CPS", page, page, 0);
else if (_flags.lang == Common::DE_DEU)
_screen->loadBitmap("MAIN_GER.CPS", page, page, 0);
diff --git a/engines/kyra/sequence/sequences_lok.cpp b/engines/kyra/sequence/sequences_lok.cpp
index e6e6457b19..f22e0d44d5 100644
--- a/engines/kyra/sequence/sequences_lok.cpp
+++ b/engines/kyra/sequence/sequences_lok.cpp
@@ -256,7 +256,7 @@ bool KyraEngine_LoK::seq_introStory() {
_screen->loadBitmap("TEXT_ENG.CPS", 3, 3, &_screen->getPalette(0));
else if (_flags.lang == Common::DE_DEU)
_screen->loadBitmap("TEXT_GER.CPS", 3, 3, &_screen->getPalette(0));
- else if (_flags.lang == Common::FR_FRA)
+ else if (_flags.lang == Common::FR_FRA || (_flags.lang == Common::ES_ESP && _flags.isTalkie) /* Spanish fan made over French CD version */ )
_screen->loadBitmap("TEXT_FRE.CPS", 3, 3, &_screen->getPalette(0));
else if (_flags.lang == Common::ES_ESP)
_screen->loadBitmap("TEXT_SPA.CPS", 3, 3, &_screen->getPalette(0));
Commit: 975ec7b120b5db4897b8de7d070de3e48d2b0bcc
https://github.com/scummvm/scummvm/commit/975ec7b120b5db4897b8de7d070de3e48d2b0bcc
Author: athrxx (athrxx at scummvm.org)
Date: 2020-06-02T20:43:27+02:00
Commit Message:
KYRA: fix nullptr dereference
This happens to Kyra 1 with the music set to MT-32, when the engine errors out prematurely due to a missing PAK file (before SoundMidiPC::init() is called).
Changed paths:
engines/kyra/sound/sound_pc_midi.cpp
diff --git a/engines/kyra/sound/sound_pc_midi.cpp b/engines/kyra/sound/sound_pc_midi.cpp
index f2c0502c42..3f7182a631 100644
--- a/engines/kyra/sound/sound_pc_midi.cpp
+++ b/engines/kyra/sound/sound_pc_midi.cpp
@@ -345,7 +345,8 @@ void SoundMidiPC::pause(bool paused) {
_music->setMidiDriver(0);
for (int i = 0; i < 3; i++)
_sfx[i]->setMidiDriver(0);
- _output->allNotesOff();
+ if (_output)
+ _output->allNotesOff();
} else {
_music->setMidiDriver(_output);
for (int i = 0; i < 3; ++i)
Commit: e81a38698d8e3a2df0a77d7f5b52bb60a3c520fd
https://github.com/scummvm/scummvm/commit/e81a38698d8e3a2df0a77d7f5b52bb60a3c520fd
Author: athrxx (athrxx at scummvm.org)
Date: 2020-06-02T20:43:28+02:00
Commit Message:
KYRA: (KYRA1/Spanish CD fan translation) - update Kyra.dat
Changed paths:
devtools/create_kyradat/create_kyradat.cpp
dists/engine-data/kyra.dat
engines/kyra/resource/staticres.cpp
diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp
index e9a7411725..1b54df73e5 100644
--- a/devtools/create_kyradat/create_kyradat.cpp
+++ b/devtools/create_kyradat/create_kyradat.cpp
@@ -45,7 +45,7 @@
enum {
- kKyraDatVersion = 99
+ kKyraDatVersion = 100
};
const ExtractFilename extractFilenames[] = {
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index f470ff63a0..3123da09d9 100644
Binary files a/dists/engine-data/kyra.dat and b/dists/engine-data/kyra.dat differ
diff --git a/engines/kyra/resource/staticres.cpp b/engines/kyra/resource/staticres.cpp
index a127d317a4..1c088c29c0 100644
--- a/engines/kyra/resource/staticres.cpp
+++ b/engines/kyra/resource/staticres.cpp
@@ -39,7 +39,7 @@
namespace Kyra {
-#define RESFILE_VERSION 99
+#define RESFILE_VERSION 100
namespace {
bool checkKyraDat(Common::SeekableReadStream *file) {
Commit: e2d8955e1ea8cb2db8201d6e64395526667d3fb6
https://github.com/scummvm/scummvm/commit/e2d8955e1ea8cb2db8201d6e64395526667d3fb6
Author: athrxx (athrxx at scummvm.org)
Date: 2020-06-02T20:49:29+02:00
Commit Message:
NEWS: update with new Spanish KYRA games
Changed paths:
NEWS.md
diff --git a/NEWS.md b/NEWS.md
index 577f3ff3c1..2d5841f971 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -15,6 +15,9 @@ For a more comprehensive changelog of the latest experimental code, see:
Kyra:
- Added support for the PC-98 version of Eye of the Beholder I.
+ - Added support for the Spanish versions of Eye of the Beholder I and II, Legend of
+ Kyrandia 1 (CD-ROM fan translation) and Legend of Kyrandia 2 (floppy version and
+ CD-ROM fan translation).
Prince:
- Fixed inventory item descriptions display.
More information about the Scummvm-git-logs
mailing list