Get rid of kGameTypeAdibouUnknown (which is a mix of other versions), and Add kGameTypeAdibou1.

svn-id: r47448

3 files changed, 28 insertions, 50 deletions

diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp
index 4bb0089e2c..d33e48b2d6 100644
--- a/engines/gob/detection.cpp
+++ b/engines/gob/detection.cpp
@@ -76,8 +76,8 @@ static const PlainGameDescriptor gobGames[] = {
 	{"geisha", "Geisha"},
 	{"adi2", "ADI 2"},
 	{"adi4", "ADI 4"},
-	{"adibou2","Adibou 2"},
-	{"adibouunknown", "Adibou unknown"},
+	{"adibou2", "Adibou 2"},
+	{"adibou1", "Adibou 1"},
 	{0, 0}
 };
 
@@ -4455,37 +4455,23 @@ static const GOBGameDescription gameDescriptions[] = {
 	},
 	{
 		{
-			"adibouunknown",
-			"",
-			AD_ENTRY1s("intro.stk", "904a93f46687617bb34e672020fc17a4", 248724),
-			FR_FRA,
-			kPlatformAtariST,
-			ADGF_NO_FLAGS,
-			GUIO_NONE
-		},
-		kGameTypeAdibouUnknown,
-		kFeaturesNone,
-		0, "base.tot", 0
-	},
-	{
-		{
-			"adibouunknown",
-			"",
-			AD_ENTRY1s("intro.stk", "1e49c39a4a3ce6032a84b712539c2d63", 8738134),
+			"adibou1",
+			"ADIBOU 1 Environnement 4-7 ans",
+			AD_ENTRY1s("intro.stk", "6db110188fcb7c5208d9721b5282682a", 4805104),
 			FR_FRA,
 			kPlatformPC,
 			ADGF_NO_FLAGS,
 			GUIO_NONE
 		},
-		kGameTypeAdibouUnknown,
+		kGameTypeAdibou1,
 		kFeaturesNone,
 		0, 0, 0
 	},
 	{
 		{
 			"adibou2",
-			"ADIBOU 1",
-			AD_ENTRY1s("intro.stk", "6db110188fcb7c5208d9721b5282682a", 4805104),
+			"ADIBOU 2",
+			AD_ENTRY1s("intro.stk", "94ae7004348dc8bf99c23a9a6ef81827", 956162),
 			FR_FRA,
 			kPlatformPC,
 			ADGF_NO_FLAGS,
@@ -4498,8 +4484,8 @@ static const GOBGameDescription gameDescriptions[] = {
 	{
 		{
 			"adibou2",
-			"ADIBOU 2",
-			AD_ENTRY1s("intro.stk", "94ae7004348dc8bf99c23a9a6ef81827", 956162),
+			"Le Jardin Magique d'Adibou",
+			AD_ENTRY1s("intro.stk", "a8ff86f3cc40dfe5898e0a741217ef27", 956328),
 			FR_FRA,
 			kPlatformPC,
 			ADGF_NO_FLAGS,
@@ -4512,8 +4498,8 @@ static const GOBGameDescription gameDescriptions[] = {
 	{
 		{
 			"adibou2",
-			"Le Jardin Magique d'Adibou",
-			AD_ENTRY1s("intro.stk", "a8ff86f3cc40dfe5898e0a741217ef27", 956328),
+			"ADIBOU 2.10 Environnement",
+			AD_ENTRY1s("intro.stk", "f2b797819aeedee557e904b0b5ccd82e", 8736454),
 			FR_FRA,
 			kPlatformPC,
 			ADGF_NO_FLAGS,
@@ -4526,8 +4512,8 @@ static const GOBGameDescription gameDescriptions[] = {
 	{
 		{
 			"adibou2",
-			"ADIBOU 2.10 Environnement",
-			AD_ENTRY1s("intro.stk", "f2b797819aeedee557e904b0b5ccd82e", 8736454),
+			"ADIBOU 2.11 Environnement",
+			AD_ENTRY1s("intro.stk", "7b1f1f6f6477f54401e95d913f75e333", 8736904),
 			FR_FRA,
 			kPlatformPC,
 			ADGF_NO_FLAGS,
@@ -4540,8 +4526,8 @@ static const GOBGameDescription gameDescriptions[] = {
 	{
 		{
 			"adibou2",
-			"ADIBOU 2.11 Environnement",
-			AD_ENTRY1s("intro.stk", "7b1f1f6f6477f54401e95d913f75e333", 8736904),
+			"ADIBOU 2.12 Environnement",
+			AD_ENTRY1s("intro.stk", "1e49c39a4a3ce6032a84b712539c2d63", 8738134),
 			FR_FRA,
 			kPlatformPC,
 			ADGF_NO_FLAGS,
@@ -4607,24 +4593,6 @@ static const GOBGameDescription gameDescriptions[] = {
 		kFeaturesNone,
 		0, 0, 0
 	},
-	{
-		{
-			"adibouunknown",
-				"ADIB\xD9 prima elementare : Imparo a leggere e a contare",
-			{
-				{"intro.stk", 0, "092707829555f27706920e4cacf1fada", 8737958},
-				{"appbou2.itk", 0, "f7bf045f6bdce5a7607c720e36704f33", 200005632},
-				{0, 0, 0, 0}
-			},
-			IT_ITA,
-			kPlatformPC,
-			ADGF_NO_FLAGS,
-			GUIO_NONE
-		},
-		kGameTypeAdibouUnknown,
-		kFeaturesNone,
-		"adibou.stk", "intro.tot", 0
-	},
 	{ AD_TABLE_END_MARKER, kGameTypeNone, kFeaturesNone, 0, 0, 0}
 };
 
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 1b02c73194..5d2598a2fd 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -358,7 +358,6 @@ bool GobEngine::initGameParts() {
 
 	switch (_gameType) {
 	case kGameTypeGeisha:
-	case kGameTypeAdibouUnknown:
 	case kGameTypeGob1:
 		_init     = new Init_v1(this);
 		_video    = new Video_v1(this);
@@ -496,6 +495,17 @@ bool GobEngine::initGameParts() {
 		_saveLoad = new SaveLoad_Playtoons(this, _targetName.c_str());
 		break;
 
+	case kGameTypeAdibou1:
+		_init     = new Init_v2(this);
+		_video    = new Video_v2(this);
+		_inter    = new Inter_v2(this);
+		_mult     = new Mult_v2(this);
+		_draw     = new Draw_v2(this);
+		_map      = new Map_v2(this);
+		_goblin   = new Goblin_v2(this);
+		_scenery  = new Scenery_v2(this);
+		_saveLoad = new SaveLoad_v2(this, _targetName.c_str());
+		break;
 	default:
 		deinitGameParts();
 		return false;
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index 468e168f27..0eca7c8a75 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -114,7 +114,7 @@ enum GameType {
 	kGameTypeAdi2,
 	kGameTypeAdi4,
 	kGameTypeAdibou2,
-	kGameTypeAdibouUnknown
+	kGameTypeAdibou1
 };
 
 enum Features {