[Scummvm-git-logs] scummvm master -> 4d0ce4020080052954b148895cf3300eede6b7b8
sdelamarre
noreply at scummvm.org
Sun Mar 12 23:06:08 UTC 2023
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e4367ed523 GOB: Separated detection tables for Adibou1 and Adibou2
84854c355e GOB: Mark all Adibou1 entries as unstable
4d0ce40200 GOB: Add a German version of Adibou1
Commit: e4367ed5238d6fa17a2d1756c64c0b9793d806f7
https://github.com/scummvm/scummvm/commit/e4367ed5238d6fa17a2d1756c64c0b9793d806f7
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2023-03-13T00:05:32+01:00
Commit Message:
GOB: Separated detection tables for Adibou1 and Adibou2
Note: "A.J.'s World of Discovery" is Adibou1 (localized).
Changed paths:
A engines/gob/detection/tables_adibou1.h
A engines/gob/detection/tables_adibou2.h
R engines/gob/detection/tables_adibou.h
R engines/gob/detection/tables_ajworld.h
engines/gob/detection/tables.h
diff --git a/engines/gob/detection/tables.h b/engines/gob/detection/tables.h
index 6b4bb90c322..e547d0c5557 100644
--- a/engines/gob/detection/tables.h
+++ b/engines/gob/detection/tables.h
@@ -90,8 +90,8 @@ static const GOBGameDescription gameDescriptions[] = {
#include "gob/detection/tables_playtoons.h" // The Playtoons series
#include "gob/detection/tables_adi2.h" // The ADI / Addy 2 series
#include "gob/detection/tables_adi4.h" // The ADI / Addy 4 series
- #include "gob/detection/tables_adibou.h" // The Adibou / Addy Junior series
- #include "gob/detection/tables_ajworld.h" // A.J.'s World of Discovery / ADI Jr.
+ #include "gob/detection/tables_adibou2.h" // The Adibou 2 / Addy Junior series
+ #include "gob/detection/tables_adibou1.h" // Adibou 1 / A.J.'s World of Discovery / ADI Jr.
#include "gob/detection/tables_crousti.h" // Croustibat
{ AD_TABLE_END_MARKER, kGameTypeNone, kFeaturesNone, 0, 0, 0}
diff --git a/engines/gob/detection/tables_ajworld.h b/engines/gob/detection/tables_adibou1.h
similarity index 57%
rename from engines/gob/detection/tables_ajworld.h
rename to engines/gob/detection/tables_adibou1.h
index a036b64bfdb..245838beddb 100644
--- a/engines/gob/detection/tables_ajworld.h
+++ b/engines/gob/detection/tables_adibou1.h
@@ -19,10 +19,57 @@
*
*/
-/* Detection tables for A.J.'s World of Discovery / ADI Jnr. */
+/* Detection tables for Adibou 1 / A.J.'s World of Discovery / ADI Jnr. */
-#ifndef GOB_DETECTION_TABLES_AJWORLD_H
-#define GOB_DETECTION_TABLES_AJWORLD_H
+#ifndef GOB_DETECTION_TABLES_ADIBOU1_H
+#define GOB_DETECTION_TABLES_ADIBOU1_H
+
+// -- French: Adibou --
+
+{
+ {
+ "adibou1",
+ "ADIBOU 1 Environnement 4-7 ans",
+ AD_ENTRY1s("intro.stk", "6db110188fcb7c5208d9721b5282682a", 4805104),
+ FR_FRA,
+ kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
+ },
+ kGameTypeAdibou1,
+ kFeaturesAdLib,
+ 0, 0, 0
+},
+
+{
+ {
+ "adibou1",
+ "ADIBOU 1 Environnement 4-7 ans",
+ AD_ENTRY1s("intro.stk", "904a93f46687617bb34e672020fc17a4", 248724),
+ FR_FRA,
+ kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
+ },
+ kGameTypeAdibou1,
+ kFeaturesAdLib | kFeaturesEGA,
+ 0, "base.tot", 0
+},
+
+{
+ {
+ "adibou1",
+ "ADIBOU 1 Environnement 4-7 ans",
+ AD_ENTRY1s("intro.stk", "228edf921ebcd9f1c6d566856f264ea4", 2647968),
+ FR_FRA,
+ kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
+ },
+ kGameTypeAdibou1,
+ kFeaturesAdLib,
+ 0, 0, 0
+},
// -- DOS VGA Floppy --
@@ -59,4 +106,4 @@
0, 0, 0
},
-#endif // GOB_DETECTION_TABLES_AJWORLD_H
+#endif // GOB_DETECTION_TABLES_ADIBOU1_H
diff --git a/engines/gob/detection/tables_adibou.h b/engines/gob/detection/tables_adibou2.h
similarity index 86%
rename from engines/gob/detection/tables_adibou.h
rename to engines/gob/detection/tables_adibou2.h
index 710ef85ae09..e7f32bf2e0e 100644
--- a/engines/gob/detection/tables_adibou.h
+++ b/engines/gob/detection/tables_adibou2.h
@@ -21,53 +21,11 @@
/* Detection tables for Adibou / Addy Junior series. */
-#ifndef GOB_DETECTION_TABLES_ADIBOU_H
-#define GOB_DETECTION_TABLES_ADIBOU_H
+#ifndef GOB_DETECTION_TABLES_ADIBOU2_H
+#define GOB_DETECTION_TABLES_ADIBOU2_H
// -- French: Adibou --
-{
- {
- "adibou1",
- "ADIBOU 1 Environnement 4-7 ans",
- AD_ENTRY1s("intro.stk", "6db110188fcb7c5208d9721b5282682a", 4805104),
- FR_FRA,
- kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
- },
- kGameTypeAdibou1,
- kFeaturesAdLib,
- 0, 0, 0
-},
-{
- {
- "adibou1",
- "ADIBOU 1 Environnement 4-7 ans",
- AD_ENTRY1s("intro.stk", "904a93f46687617bb34e672020fc17a4", 248724),
- FR_FRA,
- kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
- },
- kGameTypeAdibou1,
- kFeaturesAdLib | kFeaturesEGA,
- 0, "base.tot", 0
-},
-{
- {
- "adibou1",
- "ADIBOU 1 Environnement 4-7 ans",
- AD_ENTRY1s("intro.stk", "228edf921ebcd9f1c6d566856f264ea4", 2647968),
- FR_FRA,
- kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
- },
- kGameTypeAdibou1,
- kFeaturesAdLib,
- 0, 0, 0
-},
{
{
"adibou2",
@@ -352,4 +310,4 @@
0, 0, 11
},
-#endif // GOB_DETECTION_TABLES_ADIBOU_H
+#endif // GOB_DETECTION_TABLES_ADIBOU2_H
Commit: 84854c355e67dc17393006d04858fdd1ee6e9930
https://github.com/scummvm/scummvm/commit/84854c355e67dc17393006d04858fdd1ee6e9930
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2023-03-13T00:05:32+01:00
Commit Message:
GOB: Mark all Adibou1 entries as unstable
Changed paths:
engines/gob/detection/tables_adibou1.h
diff --git a/engines/gob/detection/tables_adibou1.h b/engines/gob/detection/tables_adibou1.h
index 245838beddb..f240aa296f9 100644
--- a/engines/gob/detection/tables_adibou1.h
+++ b/engines/gob/detection/tables_adibou1.h
@@ -33,7 +33,7 @@
AD_ENTRY1s("intro.stk", "6db110188fcb7c5208d9721b5282682a", 4805104),
FR_FRA,
kPlatformDOS,
- ADGF_NO_FLAGS,
+ ADGF_UNSTABLE,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
kGameTypeAdibou1,
@@ -48,7 +48,7 @@
AD_ENTRY1s("intro.stk", "904a93f46687617bb34e672020fc17a4", 248724),
FR_FRA,
kPlatformDOS,
- ADGF_NO_FLAGS,
+ ADGF_UNSTABLE,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
kGameTypeAdibou1,
@@ -63,7 +63,7 @@
AD_ENTRY1s("intro.stk", "228edf921ebcd9f1c6d566856f264ea4", 2647968),
FR_FRA,
kPlatformDOS,
- ADGF_NO_FLAGS,
+ ADGF_UNSTABLE,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
kGameTypeAdibou1,
@@ -80,7 +80,7 @@
AD_ENTRY1s("intro.stk", "e453bea7b28a67c930764d945f64d898", 3913628),
EN_ANY,
kPlatformDOS,
- ADGF_NO_FLAGS,
+ ADGF_UNSTABLE,
GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
kGameTypeAJWorld,
Commit: 4d0ce4020080052954b148895cf3300eede6b7b8
https://github.com/scummvm/scummvm/commit/4d0ce4020080052954b148895cf3300eede6b7b8
Author: Simon Delamarre (simon.delamarre14 at gmail.com)
Date: 2023-03-13T00:05:32+01:00
Commit Message:
GOB: Add a German version of Adibou1
Changed paths:
engines/gob/detection/tables_adibou1.h
diff --git a/engines/gob/detection/tables_adibou1.h b/engines/gob/detection/tables_adibou1.h
index f240aa296f9..5f1816799b8 100644
--- a/engines/gob/detection/tables_adibou1.h
+++ b/engines/gob/detection/tables_adibou1.h
@@ -71,6 +71,23 @@
0, 0, 0
},
+// -- German: ADI Jr. --
+
+{
+ {
+ "adibou1",
+ "ADI Jr.",
+ AD_ENTRY1s("intro.stk", "4d4c23da4cd7e080cb1769b49ace1805", 4731020),
+ DE_DEU,
+ kPlatformDOS,
+ ADGF_UNSTABLE,
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
+ },
+ kGameTypeAdibou1,
+ kFeaturesAdLib,
+ 0, 0, 0
+},
+
// -- DOS VGA Floppy --
{
More information about the Scummvm-git-logs
mailing list