[Scummvm-git-logs] scummvm master -> 6b56a0d630cc511438c078d7c1156975cf0c6706

[bluegr]

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:
e82f103270 GOB: add version numbers to Inca2 variants
15b7a9c4f1 GOB: remove copy protection flag for Adibou 1 english version
6b56a0d630 GOB: merge kGameTypeDynastyWood in kGameTypeDynasty case


Commit: e82f10327082c117b4d8e094bf5bbc4b447c0eb5
    https://github.com/scummvm/scummvm/commit/e82f10327082c117b4d8e094bf5bbc4b447c0eb5
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-01T17:42:19+03:00

Commit Message:
GOB: add version numbers to Inca2 variants

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


diff --git a/engines/gob/detection/tables_inca2.h b/engines/gob/detection/tables_inca2.h
index 590e0056d74..562610461c8 100644
--- a/engines/gob/detection/tables_inca2.h
+++ b/engines/gob/detection/tables_inca2.h
@@ -35,7 +35,7 @@
 {
 	{
 		"inca2",
-		"",
+		"v1.000",
 		AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
 		EN_USA,
 		kPlatformDOS,
@@ -48,7 +48,7 @@
 {
 	{
 		"inca2",
-		"",
+		"v1.000",
 		AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
 		FR_FRA,
 		kPlatformDOS,
@@ -61,7 +61,7 @@
 {
 	{
 		"inca2",
-		"",
+		"v1.000",
 		AD_ENTRY1s("intro.stk", "1fa92b00fe80a20f34ec34a8e2fa869e", 923072),
 		DE_DEU,
 		kPlatformDOS,


Commit: 15b7a9c4f1e0c60d7bf0ebab8c8197bd9fd94bfc
    https://github.com/scummvm/scummvm/commit/15b7a9c4f1e0c60d7bf0ebab8c8197bd9fd94bfc
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-01T17:42:19+03:00

Commit Message:
GOB: remove copy protection flag for Adibou 1 english version

This removes the Copy protection flag for the English version known as AJ's World of Discovery

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 594fc01c65e..44c735658a2 100644
--- a/engines/gob/detection/tables_adibou1.h
+++ b/engines/gob/detection/tables_adibou1.h
@@ -115,7 +115,7 @@
 		EN_GRB,
 		kPlatformDOS,
 		ADGF_NO_FLAGS,
-		GUIO3(GUIO_NOSUBTITLES, GUIO_NOSPEECH, GAMEOPTION_COPY_PROTECTION)
+		GUIO2(GUIO_NOSUBTITLES, GUIO_NOSPEECH)
 	},
 	kFeaturesAdLib,
 	0, 0, 0


Commit: 6b56a0d630cc511438c078d7c1156975cf0c6706
    https://github.com/scummvm/scummvm/commit/6b56a0d630cc511438c078d7c1156975cf0c6706
Author: Benjamin Funke (bjnfne at web.de)
Date: 2024-07-01T17:42:19+03:00

Commit Message:
GOB: merge kGameTypeDynastyWood in kGameTypeDynasty case

Since kGameTypeDynastyWood and kGameTypeDynasty use all the same classes, we can merge them together. Look like as an example Playtoons/Bambou

Changed paths:
    engines/gob/gob.cpp


diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 19db0655e58..43b906a2613 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -574,17 +574,6 @@ Common::Error GobEngine::initGameParts() {
 		break;
 
 	case kGameTypeDynasty:
-		_init     = new Init_v3(this);
-		_video    = new Video_v2(this);
-		_inter    = new Inter_v5(this);
-		_mult     = new Mult_v2(this);
-		_draw     = new Draw_v2(this);
-		_map      = new Map_v2(this);
-		_goblin   = new Goblin_v4(this);
-		_scenery  = new Scenery_v2(this);
-		_saveLoad = new SaveLoad(this);
-		break;
-
 	case kGameTypeDynastyWood:
 		_init     = new Init_v3(this);
 		_video    = new Video_v2(this);