diff --git a/engines/gob/detection.cpp b/engines/gob/detection.cpp index 4bb0089e2cb..d33e48b2d66 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,43 +4455,15 @@ 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), - FR_FRA, - kPlatformPC, - ADGF_NO_FLAGS, - GUIO_NONE - }, - kGameTypeAdibouUnknown, - kFeaturesNone, - 0, 0, 0 - }, - { - { - "adibou2", - "ADIBOU 1", + "adibou1", + "ADIBOU 1 Environnement 4-7 ans", AD_ENTRY1s("intro.stk", "6db110188fcb7c5208d9721b5282682a", 4805104), FR_FRA, kPlatformPC, ADGF_NO_FLAGS, GUIO_NONE }, - kGameTypeAdibou2, + kGameTypeAdibou1, kFeaturesNone, 0, 0, 0 }, @@ -4551,6 +4523,20 @@ static const GOBGameDescription gameDescriptions[] = { kFeaturesNone, 0, 0, 0 }, + { + { + "adibou2", + "ADIBOU 2.12 Environnement", + AD_ENTRY1s("intro.stk", "1e49c39a4a3ce6032a84b712539c2d63", 8738134), + FR_FRA, + kPlatformPC, + ADGF_NO_FLAGS, + GUIO_NONE + }, + kGameTypeAdibou2, + kFeaturesNone, + 0, 0, 0 + }, { { "adibou2", @@ -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 1b02c731945..5d2598a2fde 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 468e168f279..0eca7c8a755 100644 --- a/engines/gob/gob.h +++ b/engines/gob/gob.h @@ -114,7 +114,7 @@ enum GameType { kGameTypeAdi2, kGameTypeAdi4, kGameTypeAdibou2, - kGameTypeAdibouUnknown + kGameTypeAdibou1 }; enum Features {