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

svn-id: r34896

2 files changed, 12 insertions, 6 deletions

diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index e0c95c7120..eba8edaf91 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -92,12 +92,16 @@ public:
 
 bool Sword2MetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
-		(f == kSupportsRTL) ||
 		(f == kSupportsListSaves) ||
 		(f == kSupportsLoadingDuringStartup) ||
 		(f == kSupportsDeleteSave);
 }
 
+bool Sword2::Sword2Engine::hasFeature(EngineFeature f) const {
+	return
+		(f == kSupportsRTL);
+}
+
 GameList Sword2MetaEngine::getSupportedGames() const {
 	const Sword2::GameSettings *g = Sword2::sword2_settings;
 	GameList games;
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 9b589c347e..06d6292ec2 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -113,8 +113,6 @@ private:
 
 	uint32 calcChecksum(byte *buffer, uint32 size);
 
-	virtual void pauseEngineIntern(bool pause);
-
 	uint32 _totalStartups;
 	uint32 _totalScreenManagers;
 	uint32 _startRes;
@@ -127,8 +125,13 @@ private:
 public:
 	Sword2Engine(OSystem *syst);
 	~Sword2Engine();
-	int go();
-	int init();
+
+	// Engine APIs
+	virtual int init();
+	virtual int go();
+	virtual GUI::Debugger *getDebugger();
+	virtual bool hasFeature(EngineFeature f) const;
+	virtual void pauseEngineIntern(bool pause);
 
 	int getFramesPerSecond();
 
@@ -212,7 +215,6 @@ public:
 
 	void sleepUntil(uint32 time);
 
-	GUI::Debugger *getDebugger();
 	void initialiseFontResourceFlags();
 	void initialiseFontResourceFlags(uint8 language);