AGOS: Allow detecting games from disabled subengines

This commit is contained in:
Cameron Cawley 2020-12-04 13:36:56 +00:00 committed by Thierry Crozat
parent 4ced49acd4
commit ba8551b3ae
4 changed files with 7 additions and 4 deletions

View file

@ -1,3 +1,4 @@
engines/agos/saveload.cpp engines/agos/saveload.cpp
engines/agos/animation.cpp engines/agos/animation.cpp
engines/agos/metaengine.cpp
engines/agos/midi.cpp engines/agos/midi.cpp

View file

@ -46,13 +46,11 @@ static const PlainGameDescriptor agosGames[] = {
{"waxworks", "Waxworks"}, {"waxworks", "Waxworks"},
{"simon1", "Simon the Sorcerer 1"}, {"simon1", "Simon the Sorcerer 1"},
{"simon2", "Simon the Sorcerer 2"}, {"simon2", "Simon the Sorcerer 2"},
#ifdef ENABLE_AGOS2
{"feeble", "The Feeble Files"}, {"feeble", "The Feeble Files"},
{"dimp", "Demon in my Pocket"}, {"dimp", "Demon in my Pocket"},
{"jumble", "Jumble"}, {"jumble", "Jumble"},
{"puzzle", "NoPatience"}, {"puzzle", "NoPatience"},
{"swampy", "Swampy Adventures"}, {"swampy", "Swampy Adventures"},
#endif
{0, 0} {0, 0}
}; };

View file

@ -2551,7 +2551,6 @@ static const AGOSGameDescription gameDescriptions[] = {
GF_TALKIE | GF_WAVSFX GF_TALKIE | GF_WAVSFX
}, },
#ifdef ENABLE_AGOS2
// The Feeble Files - English DOS Demo // The Feeble Files - English DOS Demo
{ {
{ {
@ -3194,7 +3193,7 @@ static const AGOSGameDescription gameDescriptions[] = {
GID_SWAMPY, GID_SWAMPY,
GF_OLD_BUNDLE | GF_TALKIE GF_OLD_BUNDLE | GF_TALKIE
}, },
#endif
{ AD_TABLE_END_MARKER, 0, 0, 0 } { AD_TABLE_END_MARKER, 0, 0, 0 }
}; };

View file

@ -24,6 +24,7 @@
#include "common/savefile.h" #include "common/savefile.h"
#include "common/system.h" #include "common/system.h"
#include "common/installshield_cab.h" #include "common/installshield_cab.h"
#include "common/translation.h"
#include "engines/advancedDetector.h" #include "engines/advancedDetector.h"
#include "engines/obsolete.h" #include "engines/obsolete.h"
@ -97,6 +98,10 @@ Common::Error AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, con
else else
*engine = new AGOS::AGOSEngine_PuzzlePack(syst, gd); *engine = new AGOS::AGOSEngine_PuzzlePack(syst, gd);
break; break;
#else
case AGOS::GType_FF:
case AGOS::GType_PP:
return Common::Error(Common::kUnsupportedGameidError, _s("AGOS 2 support is not compiled in"));
#endif #endif
default: default:
return Common::kUnsupportedGameidError; return Common::kUnsupportedGameidError;