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

[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:
fbca4f51d3 GOB: Add detection for Adiboo 2 EN demo and ES full
b08b8cf66e GOB: Add fix for Adiboo 2 EN demo loading files from subfolder


Commit: fbca4f51d3323258dc27230c937408957c8a1215
    https://github.com/scummvm/scummvm/commit/fbca4f51d3323258dc27230c937408957c8a1215
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2022-12-12T20:40:51+01:00

Commit Message:
GOB: Add detection for Adiboo 2 EN demo and ES full

Changed paths:
    engines/gob/detection/tables_adibou.h


diff --git a/engines/gob/detection/tables_adibou.h b/engines/gob/detection/tables_adibou.h
index 33265c62582..f061f1ce469 100644
--- a/engines/gob/detection/tables_adibou.h
+++ b/engines/gob/detection/tables_adibou.h
@@ -44,7 +44,6 @@
 	{
 		"adibou1",
 		"ADIBOU 1 Environnement 4-7 ans",
-
 		AD_ENTRY1s("intro.stk", "904a93f46687617bb34e672020fc17a4", 248724),
 		FR_FRA,
 		kPlatformDOS,
@@ -203,7 +202,7 @@
 {
 	{
 		"adibou2",
-		"ADIBù 2",
+		"ADIBÙ 2",
 		AD_ENTRY1s("intro.stk", "092707829555f27706920e4cacf1fada", 8737958),
 		IT_ITA,
 		kPlatformDOS,
@@ -215,6 +214,22 @@
 	0, 0, 0
 },
 
+// -- Spanish: Adibù --
+{
+	{
+		"adibou2",
+		"ADIBÙ 2",
+		AD_ENTRY1s("intro.stk", "0b996fcd8929245fecddc4d9169843d0", 956682),
+		ES_ESP,
+		kPlatformDOS,
+		ADGF_TESTING,
+		GUIO0()
+	},
+	kGameTypeAdibou2,
+	kFeaturesNone,
+	0, 0, 0
+},
+
 // -- English: Adiboo --
 {
 	{
@@ -246,6 +261,21 @@
 	kFeatures640x480,
 	0, 0, 0
 },
+{
+	// Titlescreen says "ADIBOO: Limited version!", Sierra setup says "Adiboo 2 Demo"
+	{
+		"adibou2",
+		"ADIBOO 2 Demo",
+		AD_ENTRY1s("intro.stk", "ea6c2d25f33135db763c1175979d904a", 528108),
+		EN_GRB,
+		kPlatformDOS,
+		ADGF_DEMO | ADGF_TESTING,
+		GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
+	},
+	kGameTypeAdibou2,
+	kFeatures640x480,
+	0, 0, 0
+},
 {
 	{
 		"adibou2",


Commit: b08b8cf66e2d127bae10ed525427e6a7099e85eb
    https://github.com/scummvm/scummvm/commit/b08b8cf66e2d127bae10ed525427e6a7099e85eb
Author: eientei (einstein95 at users.noreply.github.com)
Date: 2022-12-12T20:40:51+01:00

Commit Message:
GOB: Add fix for Adiboo 2 EN demo loading files from subfolder

Changed paths:
    engines/gob/inter_v1.cpp


diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index c50b1101a82..9d89998e734 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -1835,7 +1835,7 @@ void Inter_v1::o1_manageDataFile(OpFuncParams &params) {
 	Common::String file = _vm->_game->_script->evalString();
 
 	if (!file.empty()) {
-		_vm->_dataIO->openArchive(file, true);
+		_vm->_dataIO->openArchive(Common::Path(file, '\\').rawString(), true);
 	} else {
 		_vm->_dataIO->closeArchive(true);