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

svn-id: r34896

2 files changed, 6 insertions, 2 deletions

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index fd8ccc8955..31f957e6b1 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -691,7 +691,6 @@ public:
 
 bool ScummMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
-		(f == kSupportsRTL) ||
 		(f == kSupportsListSaves) ||
 		(f == kSupportsLoadingDuringStartup) ||
 		(f == kSupportsDeleteSave) ||
@@ -701,6 +700,10 @@ bool ScummMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSavesSupportPlayTime);
 }
 
+bool ScummEngine::hasFeature(EngineFeature f) const {
+	return	(f == kSupportsRTL);
+}
+
 GameList ScummMetaEngine::getSupportedGames() const {
 	return GameList(gameDescriptions);
 }
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index ec733d32f4..0ee4302c8b 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -447,6 +447,8 @@ public:
 	virtual int go();
 	virtual void errorString(const char *buf_input, char *buf_output);
 	virtual GUI::Debugger *getDebugger();
+	virtual bool hasFeature(EngineFeature f) const;
+	virtual void syncSoundSettings();
 	virtual void pauseEngineIntern(bool pause);
 
 protected:
@@ -462,7 +464,6 @@ protected:
 	virtual void loadLanguageBundle() {}
 	void loadCJKFont();
 	void setupMusic(int midi);
-	virtual void syncSoundSettings();
 	void setTalkDelay(int talkdelay);
 	int getTalkDelay();