Get rid of AGI_AMIGA and use platform setting instead.

svn-id: r25469

3 files changed, 11 insertions, 7 deletions

diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 07c5582446..e421538cd7 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -441,7 +441,7 @@ int AgiEngine::agiDetectGame() {
 
 	assert(_gameDescription != NULL);
 
-	_opt.amigaMode = ((getFeatures() & AGI_AMIGA) == AGI_AMIGA);
+	_opt.amigaMode = (getPlatform() == Common::kPlatformAmiga);
 	_opt.agdsMode = ((getFeatures() & AGI_AGDS) == AGI_AGDS);
 	_opt.agimouse = ((getFeatures() & AGI_MOUSE) == AGI_MOUSE);
 
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 88d93d019e..3ee1e0a338 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -104,9 +104,8 @@ enum AgiGameType {
 };
 
 enum AgiGameFeatures {
-	AGI_AMIGA = 1 << 0,
-	AGI_MOUSE = 1 << 1,
-	AGI_AGDS = 1 << 2
+	AGI_MOUSE = 1 << 0,
+	AGI_AGDS = 1 << 1
 
 };
 
@@ -526,6 +525,7 @@ public:
 	const AGIGameDescription *_gameDescription;
 	uint32 getFeatures() const;
 	uint16 getVersion() const;
+	Common::Platform getPlatform() const;
 
 private:
 
diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 04b9b9ea3c..88db486b50 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -44,6 +44,10 @@ uint32 AgiEngine::getFeatures() const {
 	return _gameDescription->features;
 }
 
+Common::Platform AgiEngine::getPlatform() const {
+	return _gameDescription->desc.platform;
+}
+
 uint16 AgiEngine::getVersion() const {
 	return _gameDescription->version;
 }
@@ -497,7 +501,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::kPlatformAmiga,
 		},
 		GType_V2,
-		AGI_AMIGA,
+		0,
 		0x2440,
 	},
 
@@ -876,7 +880,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::kPlatformAmiga,
 		},
 		GType_V3,
-		AGI_AMIGA,
+		0,
 		0x3149,
 	},
 
@@ -1327,7 +1331,7 @@ static const AGIGameDescription gameDescriptions[] = {
 			Common::kPlatformAmiga,
 		},
 		GType_V2,
-		AGI_AMIGA,
+		0,
 		0x2936,
 	},