[Scummvm-git-logs] scummvm master -> 5f3a2bf3ddb48c37d9032a4f9bb3cbdc75a18035
bluegr
noreply at scummvm.org
Sat Jul 27 13:13:34 UTC 2024
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
5b803abedd GOB: remove copy protection flag for GOB2 variants
4783c9b601 GOB: define correct archive and script to DEV7 game entries
c674edbeeb GOB: add Adi1 to the list of Games using this engine list
7990f362d3 GOB: add exact DEV7 version number to detection entries
5f3a2bf3dd GOB: add nathanvacances to detection tables
Commit: 5b803abedd56963919df7aab5f8ef16f28c64688
https://github.com/scummvm/scummvm/commit/5b803abedd56963919df7aab5f8ef16f28c64688
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-27T16:13:30+03:00
Commit Message:
GOB: remove copy protection flag for GOB2 variants
some GOB2 variants do not need the flag because they have the copy protection enabled by default.
Changed paths:
engines/gob/detection/tables_gob2.h
diff --git a/engines/gob/detection/tables_gob2.h b/engines/gob/detection/tables_gob2.h
index e30edb9ae94..22dfd3450d3 100644
--- a/engines/gob/detection/tables_gob2.h
+++ b/engines/gob/detection/tables_gob2.h
@@ -502,7 +502,7 @@
EN_GRB,
kPlatformAmiga,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GAMEOPTION_COPY_PROTECTION)
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
kFeaturesNone,
0, 0, 0
@@ -515,7 +515,7 @@
DE_DEU,
kPlatformAmiga,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GAMEOPTION_COPY_PROTECTION)
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
kFeaturesNone,
0, 0, 0
@@ -528,7 +528,7 @@
IT_ITA,
kPlatformAmiga,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GAMEOPTION_COPY_PROTECTION)
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
kFeaturesNone,
0, 0, 0
@@ -571,7 +571,7 @@
FR_FRA,
kPlatformAtariST,
ADGF_NO_FLAGS,
- GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GAMEOPTION_COPY_PROTECTION)
+ GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
},
kFeaturesNone,
0, 0, 0
Commit: 4783c9b601e61af9ed87cfbf349a440ebe5a3538
https://github.com/scummvm/scummvm/commit/4783c9b601e61af9ed87cfbf349a440ebe5a3538
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-27T16:13:30+03:00
Commit Message:
GOB: define correct archive and script to DEV7 game entries
Just adding them to nearest improve more the detection entries for DEV7 games
Changed paths:
engines/gob/detection/tables_adi5.h
engines/gob/detection/tables_adibou3.h
engines/gob/detection/tables_adiboudchou.h
engines/gob/detection/tables_adiboupresente.h
diff --git a/engines/gob/detection/tables_adi5.h b/engines/gob/detection/tables_adi5.h
index ceeb8773836..5e9bdd88c38 100644
--- a/engines/gob/detection/tables_adi5.h
+++ b/engines/gob/detection/tables_adi5.h
@@ -47,7 +47,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adi5.stk", "adi5.obc", 0
},
{
{ // Supplied by BJNFNE
@@ -61,7 +61,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adi5.stk", "adi5.obc", 0
},
// -- German: Addy 5 --
@@ -78,7 +78,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adi5.stk", "adi5.obc", 0
},
{
{ // Supplied by Indy4-Fan
@@ -92,7 +92,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adi5.stk", "adi5.obc", 0
},
{
{ // Supplied by BJNFNE
@@ -106,7 +106,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adi5.stk", "adi5.obc", 0
},
{
{ // Supplied by BJNFNE
@@ -120,7 +120,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adi5.stk", "adi5.obc", 0
},
#endif // GOB_DETECTION_TABLES_ADI5_H
diff --git a/engines/gob/detection/tables_adibou3.h b/engines/gob/detection/tables_adibou3.h
index 2fc8f515a21..2e6f4843849 100644
--- a/engines/gob/detection/tables_adibou3.h
+++ b/engines/gob/detection/tables_adibou3.h
@@ -46,7 +46,7 @@
GUIO0()
},
kFeatures800x600,
- 0, 0, 0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
{
@@ -60,7 +60,7 @@
GUIO0()
},
kFeatures800x600,
- 0, 0, 0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
// -- German: Adiboo 3 --
@@ -77,7 +77,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
{
@@ -92,7 +92,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
{
@@ -107,7 +107,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
{
@@ -122,7 +122,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
{
{ // Supplied by BJNFNE
@@ -136,7 +136,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
{
{ // Supplied by BJNFNE
@@ -150,7 +150,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
// -- English: Adiboo 3 --
@@ -167,7 +167,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
// -- Dutch: Adiboo 3 --
@@ -184,7 +184,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "b3_common.stk", "b3_storyboard.obc", 0
},
#endif // GOB_DETECTION_TABLES_ADIBOU3_H
diff --git a/engines/gob/detection/tables_adiboudchou.h b/engines/gob/detection/tables_adiboudchou.h
index 505aa901b99..a06590f5948 100644
--- a/engines/gob/detection/tables_adiboudchou.h
+++ b/engines/gob/detection/tables_adiboudchou.h
@@ -48,9 +48,8 @@
GUIO0()
},
kFeatures800x600,
- 0, 0, 0
+ "adbc_envir_obc.stk", "adbc_init.obc", 0
},
-
{
{ // Supplied by BJNFNE
@@ -63,7 +62,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adbc_envir_obc.stk", "adbc_init.obc", 0
},
{
{ // Supplied by BJNFNE
@@ -76,7 +75,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adbc_envir_obc.stk", "adbc_init.obc", 0
},
{
{ // Supplied by BJNFNE
@@ -89,7 +88,7 @@
GUIO0()
},
kFeatures800x600,
- 0,0,0
+ "adbc_envir_obc.stk", "adbc_init.obc", 0
},
#endif // GOB_DETECTION_TABLES_ADIBOUDCHOU_H
diff --git a/engines/gob/detection/tables_adiboupresente.h b/engines/gob/detection/tables_adiboupresente.h
index 66de345c916..c4af1402afa 100644
--- a/engines/gob/detection/tables_adiboupresente.h
+++ b/engines/gob/detection/tables_adiboupresente.h
@@ -46,7 +46,7 @@
GUIO0()
},
kFeatures800x600,
- 0, 0, 0
+ "adibou.stk", "main.obc", 0
},
// -- French: Adibou présente Cuisine --
@@ -62,7 +62,7 @@
GUIO0()
},
kFeatures800x600,
- 0, 0, 0
+ "adibou.stk", "main.obc", 0
},
// -- French: Adibou présente Magie --
@@ -79,7 +79,7 @@
GUIO0()
},
kFeatures800x600,
- 0, 0, 0
+ "adibou.stk", "main.obc", 0
},
#endif // GOB_DETECTION_TABLES_ADIBOUPRESENTE_H
Commit: c674edbeebf5dcfbadaf73914daecb9971f83dc8
https://github.com/scummvm/scummvm/commit/c674edbeebf5dcfbadaf73914daecb9971f83dc8
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-27T16:13:30+03:00
Commit Message:
GOB: add Adi1 to the list of Games using this engine list
Changed paths:
engines/gob/gob.h
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index f3f8dadc01a..b16d618a41e 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -44,6 +44,7 @@
* Status of this engine: Supported
*
* Games using this engine:
+ * - Adi 1
* - Adi 2
* - Adi 4
* - Adi 5
Commit: 7990f362d37593fc73024355bdc0b772fedc8229
https://github.com/scummvm/scummvm/commit/7990f362d37593fc73024355bdc0b772fedc8229
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-27T16:13:30+03:00
Commit Message:
GOB: add exact DEV7 version number to detection entries
Changed paths:
engines/gob/detection/tables_adi5.h
engines/gob/detection/tables_adibou3.h
engines/gob/detection/tables_adiboupresente.h
diff --git a/engines/gob/detection/tables_adi5.h b/engines/gob/detection/tables_adi5.h
index 5e9bdd88c38..c2d11c7c741 100644
--- a/engines/gob/detection/tables_adi5.h
+++ b/engines/gob/detection/tables_adi5.h
@@ -53,7 +53,7 @@
{ // Supplied by BJNFNE
"adi5",
- _s("Missing game code"), // Adi 5 5.04 (Engine: DEV7 version 1.1.0.0)
+ _s("Missing game code"), // Adi 5 5.04 (Engine: DEV7 version 1.10a)
AD_ENTRY1s("adi5.stk", "17754a1b942c3af34e86820f19971895", 891549),
FR_FRA,
kPlatformWindows,
@@ -84,7 +84,7 @@
{ // Supplied by Indy4-Fan
"adi5",
- _s("Missing game code"), // Addy 5 5.03 (Engine: DEV7 version 1.1.0.0)
+ _s("Missing game code"), // Addy 5 5.03 (Engine: DEV7 version 1.10a)
AD_ENTRY1s("adi5.stk", "b45a85ac21fccbb890edcbba36d11f42", 885616),
DE_DEU,
kPlatformWindows,
@@ -98,7 +98,7 @@
{ // Supplied by BJNFNE
"adi5",
- _s("Missing game code"), // Addy 5 5.04 (Engine: DEV7 version 1.1.0.0)
+ _s("Missing game code"), // Addy 5 5.04 (Engine: DEV7 version 1.10a)
AD_ENTRY1s("adi5.stk", "7af169c901981f1fbf4535c194aa4cc0", 892359),
DE_DEU,
kPlatformWindows,
diff --git a/engines/gob/detection/tables_adibou3.h b/engines/gob/detection/tables_adibou3.h
index 2e6f4843849..3e6c3381999 100644
--- a/engines/gob/detection/tables_adibou3.h
+++ b/engines/gob/detection/tables_adibou3.h
@@ -99,7 +99,7 @@
{ // Supplied by BJNFNE
"adibou3",
- _s("Missing game code"), // Adiboo 3 3.10 (Engine: DEV7 version 1.3.0.0)
+ _s("Missing game code"), // Adiboo 3 3.10 (Engine: DEV7 version 1.30b)
AD_ENTRY1s("b3_common.stk", "2293ff44a5bb7a36f5219443f0ede5cf", 554569),
DE_DEU,
kPlatformWindows,
@@ -114,7 +114,7 @@
{ // Supplied by BJNFNE
"adibou3",
- _s("Missing game code"), // Adiboo 3 3.10 Demo (Engine: DEV7 version 1.3.0.0)
+ _s("Missing game code"), // Adiboo 3 3.10 Demo (Engine: DEV7 version 1.30b)
AD_ENTRY1s("b3_common.stk", "0c7624de252a9be3c67616f298ecb34a", 558632),
DE_DEU,
kPlatformWindows,
@@ -128,7 +128,7 @@
{ // Supplied by BJNFNE
"adibou3",
- _s("Missing game code"), // Adiboo 3 3.10 (shipped with English Application) (Engine: DEV7 version 1.3.0.0)
+ _s("Missing game code"), // Adiboo 3 3.10 (shipped with English Application) (Engine: DEV7 version 1.30b)
AD_ENTRY1s("b3_common.stk", "fc3a619b44366ded7027bc458d34be6a", 554569),
DE_DEU,
kPlatformWindows,
@@ -142,7 +142,7 @@
{ // Supplied by BJNFNE
"adibou3",
- _s("Missing game code"), // Adiboo 3 3.10 (shipped with Nature Application) (Engine: DEV7 version 1.3.0.0)
+ _s("Missing game code"), // Adiboo 3 3.10 (shipped with Nature Application) (Engine: DEV7 version 1.30b)
AD_ENTRY1s("b3_common.stk", "814d8edb015969618dbcc670b18fcfb4", 554569),
DE_DEU,
kPlatformWindows,
diff --git a/engines/gob/detection/tables_adiboupresente.h b/engines/gob/detection/tables_adiboupresente.h
index c4af1402afa..d1f915b4ca4 100644
--- a/engines/gob/detection/tables_adiboupresente.h
+++ b/engines/gob/detection/tables_adiboupresente.h
@@ -38,7 +38,7 @@
{
{ // Supplied by BJNFNE
"adiboudessin",
- _s("Missing game code"), // Adibou présente Dessin 1.00 (Engine: DEV7 version 1.1.0.0)
+ _s("Missing game code"), // Adibou présente Dessin 1.00 (Engine: DEV7 version 1.10a)
AD_ENTRY1s("adibou.stk", "14e3f8e9c237d4236d93e08c60b784bc", 217172),
FR_FRA,
kPlatformWindows,
Commit: 5f3a2bf3ddb48c37d9032a4f9bb3cbdc75a18035
https://github.com/scummvm/scummvm/commit/5f3a2bf3ddb48c37d9032a4f9bb3cbdc75a18035
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-27T16:13:30+03:00
Commit Message:
GOB: add nathanvacances to detection tables
Changed paths:
A engines/gob/detection/tables_nathanvacances.h
engines/gob/detection/tables.h
engines/gob/gameidtotype.h
engines/gob/gob.h
diff --git a/engines/gob/detection/tables.h b/engines/gob/detection/tables.h
index edbf317a769..4d0760086da 100644
--- a/engines/gob/detection/tables.h
+++ b/engines/gob/detection/tables.h
@@ -49,6 +49,7 @@ static const PlainGameDescriptor gobGames[] = {
{"lit", "Lost in Time"},
{"lit1", "Lost in Time Part 1"},
{"lit2", "Lost in Time Part 2"},
+ {"nathanvacances", "Nathan Vacances"},
{"inca2", "Inca II: Wiracocha"},
{"woodruff", "The Bizarre Adventures of Woodruff and the Schnibble"},
{"dynasty", "The Last Dynasty"},
@@ -95,6 +96,7 @@ static const GOBGameDescription gameDescriptions[] = {
#include "gob/detection/tables_littlered.h" // Once Upon A Time: Little Red Riding Hood
#include "gob/detection/tables_onceupon.h" // Once Upon A Time: Baba Yaga and Abracadabra
#include "gob/detection/tables_lit.h" // Lost in Time
+ #include "gob/detection/tables_nathanvacances.h" // Nathan Vacances series
#include "gob/detection/tables_fascin.h" // Fascination
#include "gob/detection/tables_geisha.h" // Geisha
#include "gob/detection/tables_inca2.h" // Inca II: Wiracocha
diff --git a/engines/gob/detection/tables_nathanvacances.h b/engines/gob/detection/tables_nathanvacances.h
new file mode 100644
index 00000000000..726bfc4d993
--- /dev/null
+++ b/engines/gob/detection/tables_nathanvacances.h
@@ -0,0 +1,52 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ * This file is dual-licensed.
+ * In addition to the GPLv3 license mentioned above, this code is also
+ * licensed under LGPL 2.1. See LICENSES/COPYING.LGPL file for the
+ * full text of the license.
+ *
+ */
+
+/* Detection tables for the Nathan Vacances series. */
+/* This Game uses the DEV7 Engine, more Information can be found here: https://wiki.scummvm.org/index.php?title=DEV7_Information */
+
+#ifndef GOB_DETECTION_TABLES_NATHANVACANCES_H
+#define GOB_DETECTION_TABLES_NATHANVACANCES_H
+
+//#include "common/translation.h" // Make release checker happy
+
+// -- French: Nathan Vacances --
+
+{
+ {
+ "nathanvacances",
+ _s("Missing game code"), // CM1/CE2 1.00 (DEV7 version 1.20a)
+ AD_ENTRY1s("common.stk", "344185d17c593122a548122df63b70cf", 1851672),
+ FR_FRA,
+ kPlatformWindows,
+ ADGF_UNSUPPORTED,
+ GUIO0()
+ },
+ kFeatures800x600,
+ "common.stk", "A5HS_Start.obc", 0
+},
+
+#endif // GOB_DETECTION_TABLES_NATHANVACANCES_H
diff --git a/engines/gob/gameidtotype.h b/engines/gob/gameidtotype.h
index 13fd5da04dc..93678ea10cc 100644
--- a/engines/gob/gameidtotype.h
+++ b/engines/gob/gameidtotype.h
@@ -51,6 +51,7 @@ static const GameIdToType gameIdToType[] = {
{ "lit", kGameTypeLostInTime },
{ "lit1", kGameTypeLostInTime },
{ "lit2", kGameTypeLostInTime },
+ { "nathanvacances", kGameTypeNone },
{ "inca2", kGameTypeInca2 },
{ "woodruff", kGameTypeWoodruff },
{ "dynasty", kGameTypeDynasty },
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index b16d618a41e..8c5c792e5e8 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -65,6 +65,7 @@
* - Bargon Attack
* - Le pays des Pierres Magiques
* - Lost in Time
+ * - Nathan Vacances CM1/CE2
* - The Bizarre Adventures of Woodruff and the Schnibble
* - Fascination
* - Inca II: Nations of Immortality
More information about the Scummvm-git-logs
mailing list