1 files changed, 17 insertions, 34 deletions

diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp
index 7c7c6b0a36..de80e75341 100644
--- a/engines/lastexpress/detection.cpp
+++ b/engines/lastexpress/detection.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "lastexpress/lastexpress.h"
+#include "engines/advancedDetector.h"
 
 namespace LastExpress {
 
@@ -46,7 +47,7 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::EN_ANY,
 		Common::kPlatformUnknown,
-		ADGF_NO_FLAGS,
+		ADGF_UNSTABLE,
 		Common::GUIO_NONE
 	},
 
@@ -64,7 +65,7 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::EN_ANY,
 		Common::kPlatformUnknown,
-		ADGF_NO_FLAGS,
+		ADGF_UNSTABLE,
 		Common::GUIO_NONE
 	},
 
@@ -82,7 +83,7 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::EN_ANY,
 		Common::kPlatformUnknown,
-		ADGF_NO_FLAGS,
+		ADGF_UNSTABLE,
 		Common::GUIO_NONE
 	},
 
@@ -97,7 +98,7 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::EN_ANY,
 		Common::kPlatformUnknown,
-		ADGF_DEMO,
+		ADGF_DEMO | ADGF_UNSTABLE,
 		Common::GUIO_NONE
 	},
 
@@ -115,7 +116,7 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::FR_FRA,
 		Common::kPlatformUnknown,
-		ADGF_NO_FLAGS,
+		ADGF_UNSTABLE,
 		Common::GUIO_NONE
 	},
 
@@ -133,7 +134,7 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::DE_DEU,
 		Common::kPlatformUnknown,
-		ADGF_NO_FLAGS,
+		ADGF_UNSTABLE,
 		Common::GUIO_NONE
 	},
 
@@ -151,7 +152,7 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::ES_ESP,
 		Common::kPlatformUnknown,
-		ADGF_NO_FLAGS,
+		ADGF_UNSTABLE,
 		Common::GUIO_NONE
 	},
 
@@ -169,42 +170,20 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::IT_ITA,
 		Common::kPlatformUnknown,
-		ADGF_NO_FLAGS,
+		ADGF_UNSTABLE,
 		Common::GUIO_NONE
 	},
 
 	AD_TABLE_END_MARKER
 };
 
-static const ADParams detectionParams = {
-	// Pointer to ADGameDescription or its superset structure
-	(const byte *)gameDescriptions,
-	// Size of that superset structure
-	sizeof(ADGameDescription),
-	// Number of bytes to compute MD5 sum for
-	5000,
-	// List of all engine targets
-	lastExpressGames,
-	// Structure for autoupgrading obsolete targets
-	0,
-	// Name of single gameid (optional)
-	"lastexpress",
-	// List of files for file-based fallback detection (optional)
-	0,
-	// Flags
-	0,
-	// Additional GUI options (for every game}
-	Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX,
-	// Maximum directory depth
-	1,
-	// List of directory globs
-	0
-};
-
 
 class LastExpressMetaEngine : public AdvancedMetaEngine {
 public:
-	LastExpressMetaEngine() : AdvancedMetaEngine(detectionParams) {}
+	LastExpressMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(ADGameDescription), lastExpressGames) {
+		_singleid = "lastexpress";
+		_guioptions = Common::GUIO_NOSUBTITLES | Common::GUIO_NOSFX;
+	}
 
 	const char *getName() const {
 		return "Lastexpress";
@@ -224,6 +203,10 @@ bool LastExpressMetaEngine::createInstance(OSystem *syst, Engine **engine, const
 	return gd != 0;
 }
 
+bool LastExpressEngine::isDemo() const {
+	return (bool)(_gameDescription->flags & ADGF_DEMO);
+}
+
 } // End of namespace LastExpress
 
 #if PLUGIN_ENABLED_DYNAMIC(LASTEXPRESS)