diff options
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/detection.cpp | 30 | ||||
| -rw-r--r-- | engines/groovie/groovie.h | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index e29a387e46..0b9d7424bb 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -59,7 +59,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "t7g", "", AD_ENTRY1s("script.grv", "d1b8033b40aa67c076039881eccce90d", 16659), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieT7G, 0 }, @@ -69,7 +69,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "t7g", "", AD_ENTRY1s("script.grv", "6e30b54b1f3bc2262cdcf7961db2ae67", 17191), - Common::EN_ANY, Common::kPlatformMacintosh, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS }, kGroovieT7G, 0 }, @@ -83,7 +83,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "intro.gjd", 0, NULL, 31711554}, { NULL, 0, NULL, 0} }, - Common::RU_RUS, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieT7G, 0 }, @@ -94,7 +94,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "11h", "", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 1 }, @@ -104,7 +104,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "11h", "Demo", AD_ENTRY1s("disk.1", "aacb32ce07e0df2894bd83a3dee40c12", 70), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_DEMO + Common::EN_ANY, Common::kPlatformPC, ADGF_DEMO }, kGroovieV2, 1 }, @@ -114,7 +114,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "making11h", "", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 2 }, @@ -124,7 +124,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "clantrailer", "", AD_ENTRY1s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 3 }, @@ -134,7 +134,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "clandestiny", "", AD_ENTRY1s("disk.1", "f79fc1515174540fef6a34132efc4c53", 76), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 1 }, @@ -144,7 +144,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "unclehenry", "", AD_ENTRY1s("disk.1", "0e1b1d3cecc4fc7efa62a968844d1f7a", 72), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 1 }, @@ -154,7 +154,7 @@ static const GroovieGameDescription gameDescriptions[] = { { "tlc", "", AD_ENTRY1s("disk.1", "32a1afa68478f1f9d2b25eeea427f2e3", 84), - Common::EN_ANY, Common::kPlatformPC, Common::ADGF_NO_FLAGS + Common::EN_ANY, Common::kPlatformPC, ADGF_NO_FLAGS }, kGroovieV2, 1 }, @@ -163,7 +163,7 @@ static const GroovieGameDescription gameDescriptions[] = { {AD_TABLE_END_MARKER, kGroovieT7G, 0} }; -static const Common::ADParams detectionParams = { +static const ADParams detectionParams = { // Pointer to ADGameDescription or its superset structure (const byte *)gameDescriptions, // Size of that superset structure @@ -183,9 +183,9 @@ static const Common::ADParams detectionParams = { }; -class GroovieMetaEngine : public Common::AdvancedMetaEngine { +class GroovieMetaEngine : public AdvancedMetaEngine { public: - GroovieMetaEngine() : Common::AdvancedMetaEngine(detectionParams) {} + GroovieMetaEngine() : AdvancedMetaEngine(detectionParams) {} const char *getName() const { return "Groovie Engine"; @@ -195,7 +195,7 @@ public: return "Groovie Engine (C) 1990-1996 Trilobyte"; } - bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *gd) const; + bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; bool hasFeature(MetaEngineFeature f) const; SaveStateList listSaves(const char *target) const; @@ -204,7 +204,7 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const; }; -bool GroovieMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *gd) const { +bool GroovieMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const { if (gd) { *engine = new GroovieEngine(syst, (GroovieGameDescription *)gd); } diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h index 640b7b6996..008af42eeb 100644 --- a/engines/groovie/groovie.h +++ b/engines/groovie/groovie.h @@ -26,7 +26,7 @@ #ifndef GROOVIE_H #define GROOVIE_H -#include "common/advancedDetector.h" +#include "engines/advancedDetector.h" #include "engines/engine.h" #include "graphics/surface.h" @@ -62,7 +62,7 @@ enum kEngineVersion { }; struct GroovieGameDescription { - Common::ADGameDescription desc; + ADGameDescription desc; kEngineVersion version; // Version of the engine int indexEntry; // The index of the entry in disk.1 for V2 games |