Fixed the EngineFeature vs. MetaEngineFeature mess, clarified some EngineFeature comments

svn-id: r34896

2 files changed, 10 insertions, 6 deletions

diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 8b859c62e1..0d4f8244ac 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -1073,12 +1073,16 @@ public:
 
 bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
-		(f == kSupportsRTL) ||
 		(f == kSupportsListSaves) ||
 		(f == kSupportsLoadingDuringStartup) ||
 		(f == kSupportsDeleteSave) ||
 	   	(f == kSavesSupportMetaInfo) ||
-		(f == kSavesSupportThumbnail) ||
+		(f == kSavesSupportThumbnail);
+}
+
+bool Kyra::KyraEngine_v1::hasFeature(EngineFeature f) const {
+	return
+		(f == kSupportsRTL) ||
 		(f == kSupportsLoadingDuringRuntime);
 }
 
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 114536c381..81eea7420c 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -114,9 +114,6 @@ public:
 	KyraEngine_v1(OSystem *system, const GameFlags &flags);
 	virtual ~KyraEngine_v1();
 
-	::GUI::Debugger *getDebugger();
-
-	virtual void pauseEngineIntern(bool pause);
 
 	uint8 game() const { return _flags.gameID; }
 	const GameFlags &gameFlags() const { return _flags; }
@@ -170,8 +167,11 @@ public:
 	virtual void delayWithTicks(int ticks);
 
 protected:
-	virtual int go() = 0;
+	// Engine APIs
 	virtual int init();
+	virtual ::GUI::Debugger *getDebugger();
+	virtual bool hasFeature(EngineFeature f) const;
+	virtual void pauseEngineIntern(bool pause);
 
 	// intern
 	Resource *_res;