From 87e2c4c1a933cbfb8cb03e36531503f0d1122053 Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Sat, 27 Feb 2016 10:46:37 +0100
Subject: ADL: Rename game type

---
 engines/adl/adl.cpp       |  2 +-
 engines/adl/adl.h         |  2 +-
 engines/adl/detection.cpp | 33 ++++++---------------------------
 3 files changed, 8 insertions(+), 29 deletions(-)

(limited to 'engines')

diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index be3d8d7151..b96ecc8b97 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -145,7 +145,7 @@ void AdlEngine::printStrings(Common::SeekableReadStream &stream, int count) {
 
 AdlEngine *AdlEngine::create(GameType type, OSystem *syst, const AdlGameDescription *gd) {
 	switch(type) {
-	case kGameTypeAdl1:
+	case kGameTypeHires1:
 		return AdlEngine_v1__create(syst, gd);
 	default:
 		error("Unknown GameType");
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index d5a518faa7..e945a45ec8 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -41,7 +41,7 @@ struct AdlGameDescription;
 
 enum GameType {
 	kGameTypeNone = 0,
-	kGameTypeAdl1
+	kGameTypeHires1
 };
 
 Common::String asciiToApple(Common::String str);
diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index ba4e0104b9..9fadb9d3d7 100644
--- a/engines/adl/detection.cpp
+++ b/engines/adl/detection.cpp
@@ -20,14 +20,9 @@
  *
  */
 
-#include "adl/adl.h"
-
-#include "common/config-manager.h"
-#include "common/error.h"
-#include "common/fs.h"
-
 #include "engines/advancedDetector.h"
-#include "engines/metaengine.h"
+
+#include "adl/adl.h"
 
 namespace Adl {
 
@@ -36,22 +31,7 @@ struct AdlGameDescription {
 	GameType gameType;
 };
 
-uint32 AdlEngine::getFeatures() const {
-	return _gameDescription->desc.flags;
-}
-
-const char *AdlEngine::getGameId() const {
-	return _gameDescription->desc.gameid;
-}
-
-const char *const directoryGlobs[] = {
-	"game",
-	"datafiles",
-	0
-};
-
 static const PlainGameDescriptor adlGames[] = {
-	// Games
 	{"hires1", "Hi-Res Adventure #1: Mystery House"},
 	{0, 0}
 };
@@ -72,7 +52,7 @@ static const AdlGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			GUIO0()
 		},
-		kGameTypeAdl1
+		kGameTypeHires1
 	},
 	{AD_TABLE_END_MARKER, kGameTypeNone}
 };
@@ -82,7 +62,7 @@ public:
 	AdlMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(AdlGameDescription), adlGames) { }
 
 	const char *getName() const {
-		return "Hi-Res Adventure";
+		return "ADL";
 	}
 
 	const char *getOriginalCopyright() const {
@@ -93,10 +73,9 @@ public:
 };
 
 bool AdlMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const {
-	if (gd) {
+	if (gd)
 		*engine = AdlEngine::create(((const AdlGameDescription *)gd)->gameType, syst, (const AdlGameDescription *)gd);
-	}
-	return gd != 0;
+	return gd != nullptr;
 }
 
 } // End of namespace Adl
-- 
cgit v1.2.3