[Scummvm-git-logs] scummvm master -> 40e89381ee58e3f1f732b69bd50b0d5ba7a8b68f
bluegr
noreply at scummvm.org
Sat Mar 2 12:09:50 UTC 2024
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9b46dd6d49 GOB: add adiboucuisine to GameIDToType
08dc1979dd GOB: add Adibou games to Games using this engines list
8a7df46169 GOB: use correct name of Adibou présente titles
9e43a4ba9b GOB: add dynastywood to GameIDToType
7a274db982 GOB: Rename German version of Adi 2
4d3c88618b GOB: Rename some Adi 4 entries
942fbc1ecb GOB: Mark Dynasty entry as Windows
40e89381ee GOB: Whitespace fixes
Commit: 9b46dd6d4978d61bce3d7a530b828909236b3c88
https://github.com/scummvm/scummvm/commit/9b46dd6d4978d61bce3d7a530b828909236b3c88
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-03-02T14:09:44+02:00
Commit Message:
GOB: add adiboucuisine to GameIDToType
Changed paths:
engines/gob/gameidtotype.h
diff --git a/engines/gob/gameidtotype.h b/engines/gob/gameidtotype.h
index f97065e0868..6218d063375 100644
--- a/engines/gob/gameidtotype.h
+++ b/engines/gob/gameidtotype.h
@@ -73,6 +73,7 @@ static const GameIdToType gameIdToType[] = {
{ "adibou1", kGameTypeAdibou1 },
{ "adibou2", kGameTypeAdibou2 },
{ "adibou3", kGameTypeNone },
+ { "adiboucuisine", kGameTypeNone },
{ "adiboudessin", kGameTypeNone },
{ "adiboudchoumer", kGameTypeNone },
{ "adiboudchoubanquise", kGameTypeNone },
Commit: 08dc1979dd593ff6ffa965f13c0489282a30f62d
https://github.com/scummvm/scummvm/commit/08dc1979dd593ff6ffa965f13c0489282a30f62d
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-03-02T14:09:44+02:00
Commit Message:
GOB: add Adibou games to Games using this engines list
Changed paths:
engines/gob/gob.h
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index f7d0ff8c0f1..96b4e74c4fa 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -50,6 +50,12 @@
* - Adibou 1
* - Adibou 2
* - Adibou 3
+ * - Adibou présente Cuisine
+ * - Adibou présente Dessin
+ * - Adiboud'chou a la mer
+ * - Adiboud'chou sur la banquise
+ * - Adiboud'chou a la campagne
+ * - Adiboud'chou dans la jungle et la savane
* - Gobliiins
* - Gobliins 2
* - Goblins 3
Commit: 8a7df461694adfdaaf10ba63bbe9b4c146afb584
https://github.com/scummvm/scummvm/commit/8a7df461694adfdaaf10ba63bbe9b4c146afb584
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-03-02T14:09:44+02:00
Commit Message:
GOB: use correct name of Adibou présente titles
Changed paths:
engines/gob/detection/tables.h
diff --git a/engines/gob/detection/tables.h b/engines/gob/detection/tables.h
index 6e1198f893b..689b01fa676 100644
--- a/engines/gob/detection/tables.h
+++ b/engines/gob/detection/tables.h
@@ -72,8 +72,8 @@ static const PlainGameDescriptor gobGames[] = {
{"adibou1", "Adibou 1"},
{"adibou2", "Adibou 2"},
{"adibou3", "Adibou 3"},
- {"adiboucuisine", "Adibou presente Cuisine"},
- {"adiboudessin", "Adibou presente Dessin"},
+ {"adiboucuisine", "Adibou présente Cuisine"},
+ {"adiboudessin", "Adibou présente Dessin"},
{"adiboudchoumer", "Adiboud'chou a la mer"},
{"adiboudchoubanquise", "Adiboud'chou sur la banquise"},
{"adiboudchoucampagne", "Adiboud'chou a la campagne"},
@@ -106,7 +106,7 @@ static const GOBGameDescription gameDescriptions[] = {
#include "gob/detection/tables_adibou1.h" // Adibou 1 / A.J.'s World of Discovery / ADI Jr.
#include "gob/detection/tables_adibou2.h" // The Adibou 2 / Addy Junior series
#include "gob/detection/tables_adibou3.h" // Adibou 3 / Adiboo 3 series
- #include "gob/detection/tables_adiboupresente.h" // Adibou presente series
+ #include "gob/detection/tables_adiboupresente.h" // Adibou présente series
#include "gob/detection/tables_adiboudchou.h" // Adiboud'chou / Addy Buschu series
#include "gob/detection/tables_crousti.h" // Croustibat
Commit: 9e43a4ba9b9e08e7fe6122e93a01d411b1c079df
https://github.com/scummvm/scummvm/commit/9e43a4ba9b9e08e7fe6122e93a01d411b1c079df
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-03-02T14:09:44+02:00
Commit Message:
GOB: add dynastywood to GameIDToType
without this addition the demo with the combined demo of Woodruff won't start and print an error message with missing game id "dynastywood"
Changed paths:
engines/gob/gameidtotype.h
diff --git a/engines/gob/gameidtotype.h b/engines/gob/gameidtotype.h
index 6218d063375..a58ee68c8fa 100644
--- a/engines/gob/gameidtotype.h
+++ b/engines/gob/gameidtotype.h
@@ -54,6 +54,7 @@ static const GameIdToType gameIdToType[] = {
{ "inca2", kGameTypeInca2 },
{ "woodruff", kGameTypeWoodruff },
{ "dynasty", kGameTypeDynasty },
+ { "dynastywood", kGameTypeDynastyWood },
{ "urban", kGameTypeUrban },
{ "playtoons1", kGameTypePlaytoons },
{ "playtoons2", kGameTypePlaytoons },
Commit: 7a274db982a84ac0b0048c4e347d8b47a8e8f961
https://github.com/scummvm/scummvm/commit/7a274db982a84ac0b0048c4e347d8b47a8e8f961
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-03-02T14:09:44+02:00
Commit Message:
GOB: Rename German version of Adi 2
Reason for this change is the German version contains English and Mathe/German Application. Which uses the same INTRO.STK so to not confuse the user we rename it to Adi 2 (CD)
Changed paths:
engines/gob/detection/tables_adi2.h
diff --git a/engines/gob/detection/tables_adi2.h b/engines/gob/detection/tables_adi2.h
index 0a42601f84e..3f4d1517bae 100644
--- a/engines/gob/detection/tables_adi2.h
+++ b/engines/gob/detection/tables_adi2.h
@@ -129,7 +129,7 @@
{
{ // 1994 CD version
"adi2",
- "Adi Deutsch Klasse 1+2 (CD)",
+ "Adi 2 (CD)",
AD_ENTRY1s("adi2.stk", "157a26943a021d92f5c76f6eb8f18f2a", 12960390),
DE_DEU,
kPlatformWindows,
Commit: 4d3c88618bfbb826a82d28c28ffe42cdefc302af
https://github.com/scummvm/scummvm/commit/4d3c88618bfbb826a82d28c28ffe42cdefc302af
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-03-02T14:09:44+02:00
Commit Message:
GOB: Rename some Adi 4 entries
- added complete version numbers
- add reference which Environment is used in this version
Changed paths:
engines/gob/detection/tables_adi4.h
diff --git a/engines/gob/detection/tables_adi4.h b/engines/gob/detection/tables_adi4.h
index cb14ad09f9c..8a7e28e44a3 100644
--- a/engines/gob/detection/tables_adi4.h
+++ b/engines/gob/detection/tables_adi4.h
@@ -35,7 +35,7 @@
{
{
"adi4",
- "Adi 4.0",
+ "Adi 4.00 Collège",
AD_ENTRY1s("intro.stk", "a3c35d19b2d28ea261d96321d208cb5a", 6021466),
FR_FRA,
kPlatformWindows,
@@ -48,7 +48,7 @@
{
{
"adi4",
- "Adi 4.0",
+ "Adi 4.00",
AD_ENTRY1s("intro.stk", "44491d85648810bc6fcf84f9b3aa47d5", 5834944),
FR_FRA,
kPlatformWindows,
@@ -61,7 +61,7 @@
{
{
"adi4",
- "Adi 4.0",
+ "Adi 4.00 École",
AD_ENTRY1s("intro.stk", "29374c0e3c10b17dd8463b06a55ad093", 6012072),
FR_FRA,
kPlatformWindows,
@@ -74,7 +74,7 @@
{
{
"adi4",
- "Adi 4.0 Limited Edition",
+ "Adi 4.00 Limited Edition",
AD_ENTRY1s("intro.stk", "ebbbc5e28a4adb695535ed989c1b8d66", 5929644),
FR_FRA,
kPlatformWindows,
@@ -155,7 +155,7 @@
{
{
"adi4",
- "Addy 4.21",
+ "Addy 4.21 Sekundarstufe Basisprogramm",
AD_ENTRY1s("intro.stk", "534f0b674cd4830df94a9c32c4ea7225", 6878034),
DE_DEU,
kPlatformWindows,
@@ -187,7 +187,7 @@
{
{
"adi4",
- "Adi 4.0 Interactive Demo",
+ "Adi 4.00 Interactive Demo",
AD_ENTRY1s("intro.stk", "89ace204dbaac001425c73f394334f6f", 2413102),
FR_FRA,
kPlatformWindows,
@@ -200,7 +200,7 @@
{
{
"adi4",
- "Adi 4.0 / Adibou 2 Demo",
+ "Adi 4.00 / Adibou 2 Demo",
AD_ENTRY1s("intro.stk", "d41d8cd98f00b204e9800998ecf8427e", 0),
FR_FRA,
kPlatformWindows,
Commit: 942fbc1ecba6ea505d5a213d75df3eb60dcef5a9
https://github.com/scummvm/scummvm/commit/942fbc1ecba6ea505d5a213d75df3eb60dcef5a9
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-03-02T14:09:44+02:00
Commit Message:
GOB: Mark Dynasty entry as Windows
Changed paths:
engines/gob/detection/tables_dynasty.h
diff --git a/engines/gob/detection/tables_dynasty.h b/engines/gob/detection/tables_dynasty.h
index eb0c58b05c8..e14edac0140 100644
--- a/engines/gob/detection/tables_dynasty.h
+++ b/engines/gob/detection/tables_dynasty.h
@@ -38,7 +38,7 @@
"",
AD_ENTRY1s("intro.stk", "6190e32404b672f4bbbc39cf76f41fda", 2511470),
EN_USA,
- kPlatformDOS,
+ kPlatformWindows,
ADGF_NO_FLAGS,
GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GUIO_NOASPECT)
},
Commit: 40e89381ee58e3f1f732b69bd50b0d5ba7a8b68f
https://github.com/scummvm/scummvm/commit/40e89381ee58e3f1f732b69bd50b0d5ba7a8b68f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-03-02T14:09:44+02:00
Commit Message:
GOB: Whitespace fixes
Changed paths:
engines/gob/gameidtotype.h
diff --git a/engines/gob/gameidtotype.h b/engines/gob/gameidtotype.h
index a58ee68c8fa..02df7945db2 100644
--- a/engines/gob/gameidtotype.h
+++ b/engines/gob/gameidtotype.h
@@ -54,7 +54,7 @@ static const GameIdToType gameIdToType[] = {
{ "inca2", kGameTypeInca2 },
{ "woodruff", kGameTypeWoodruff },
{ "dynasty", kGameTypeDynasty },
- { "dynastywood", kGameTypeDynastyWood },
+ { "dynastywood", kGameTypeDynastyWood },
{ "urban", kGameTypeUrban },
{ "playtoons1", kGameTypePlaytoons },
{ "playtoons2", kGameTypePlaytoons },
@@ -74,7 +74,7 @@ static const GameIdToType gameIdToType[] = {
{ "adibou1", kGameTypeAdibou1 },
{ "adibou2", kGameTypeAdibou2 },
{ "adibou3", kGameTypeNone },
- { "adiboucuisine", kGameTypeNone },
+ { "adiboucuisine", kGameTypeNone },
{ "adiboudessin", kGameTypeNone },
{ "adiboudchoumer", kGameTypeNone },
{ "adiboudchoubanquise", kGameTypeNone },
More information about the Scummvm-git-logs
mailing list