From 2c0ed5e252d68020d6db6bc3b30964ebbe42f382 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 31 May 2013 02:34:30 +0100
Subject: QUEEN: Minor cleanup of detection code.

---
 engines/queen/detection.cpp | 29 ++++++++---------------------
 engines/queen/queen.cpp     |  8 ++++++++
 2 files changed, 16 insertions(+), 21 deletions(-)

(limited to 'engines')

diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index 678ae605d3..1886da88de 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -48,8 +48,13 @@ static const ExtraGuiOption queenExtraGuiOption = {
 
 class QueenMetaEngine : public MetaEngine {
 public:
-	virtual const char *getName() const;
-	virtual const char *getOriginalCopyright() const;
+	virtual const char *getName() const {
+		return "Queen";
+	}
+
+	virtual const char *getOriginalCopyright() const {
+		return "Flight of the Amazon Queen (C) John Passfield and Steve Stamatiadis";
+	}
 
 	virtual bool hasFeature(MetaEngineFeature f) const;
 	virtual GameList getSupportedGames() const;
@@ -57,20 +62,12 @@ public:
 	virtual GameDescriptor findGame(const char *gameid) const;
 	virtual GameList detectGames(const Common::FSList &fslist) const;
 	virtual SaveStateList listSaves(const char *target) const;
-	virtual int getMaximumSaveSlot() const;
+	virtual int getMaximumSaveSlot() const { return 99; }
 	virtual void removeSaveState(const char *target, int slot) const;
 
 	virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
 };
 
-const char *QueenMetaEngine::getName() const {
-	return "Queen";
-}
-
-const char *QueenMetaEngine::getOriginalCopyright() const {
-	return "Flight of the Amazon Queen (C) John Passfield and Steve Stamatiadis";
-}
-
 bool QueenMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
 		(f == kSupportsListSaves) ||
@@ -78,22 +75,12 @@ bool QueenMetaEngine::hasFeature(MetaEngineFeature f) const {
 		(f == kSupportsDeleteSave);
 }
 
-bool Queen::QueenEngine::hasFeature(EngineFeature f) const {
-	return
-		(f == kSupportsRTL) ||
-		(f == kSupportsLoadingDuringRuntime) ||
-		(f == kSupportsSavingDuringRuntime) ||
-		(f == kSupportsSubtitleOptions);
-}
-
 GameList QueenMetaEngine::getSupportedGames() const {
 	GameList games;
 	games.push_back(queenGameDescriptor);
 	return games;
 }
 
-int QueenMetaEngine::getMaximumSaveSlot() const { return 99; }
-
 const ExtraGuiOptions QueenMetaEngine::getExtraGuiOptions(const Common::String &target) const {
 	Common::String guiOptions;
 	ExtraGuiOptions options;
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp
index 3fb7f68dfb..8d4db75cc1 100644
--- a/engines/queen/queen.cpp
+++ b/engines/queen/queen.cpp
@@ -315,6 +315,14 @@ GUI::Debugger *QueenEngine::getDebugger() {
 	return _debugger;
 }
 
+bool Queen::QueenEngine::hasFeature(EngineFeature f) const {
+	return
+		(f == kSupportsRTL) ||
+		(f == kSupportsLoadingDuringRuntime) ||
+		(f == kSupportsSavingDuringRuntime) ||
+		(f == kSupportsSubtitleOptions);
+}
+
 Common::Error QueenEngine::run() {
 	initGraphics(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT, false);
 
-- 
cgit v1.2.3