[Scummvm-cvs-logs] SF.net SVN: scummvm: [25469] scummvm/trunk/engines/agi

[sev at users.sourceforge.net]

Revision: 25469
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25469&view=rev
Author:   sev
Date:     2007-02-10 09:10:55 -0800 (Sat, 10 Feb 2007)

Log Message:
-----------
Get rid of AGI_AMIGA and use platform setting instead.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/detection.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2007-02-10 17:00:36 UTC (rev 25468)
+++ scummvm/trunk/engines/agi/agi.cpp	2007-02-10 17:10:55 UTC (rev 25469)
@@ -441,7 +441,7 @@
 
 	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);
 

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2007-02-10 17:00:36 UTC (rev 25468)
+++ scummvm/trunk/engines/agi/agi.h	2007-02-10 17:10:55 UTC (rev 25469)
@@ -104,9 +104,8 @@
 };
 
 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 @@
 	const AGIGameDescription *_gameDescription;
 	uint32 getFeatures() const;
 	uint16 getVersion() const;
+	Common::Platform getPlatform() const;
 
 private:
 

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2007-02-10 17:00:36 UTC (rev 25468)
+++ scummvm/trunk/engines/agi/detection.cpp	2007-02-10 17:10:55 UTC (rev 25469)
@@ -44,6 +44,10 @@
 	return _gameDescription->features;
 }
 
+Common::Platform AgiEngine::getPlatform() const {
+	return _gameDescription->desc.platform;
+}
+
 uint16 AgiEngine::getVersion() const {
 	return _gameDescription->version;
 }
@@ -497,7 +501,7 @@
 			Common::kPlatformAmiga,
 		},
 		GType_V2,
-		AGI_AMIGA,
+		0,
 		0x2440,
 	},
 
@@ -876,7 +880,7 @@
 			Common::kPlatformAmiga,
 		},
 		GType_V3,
-		AGI_AMIGA,
+		0,
 		0x3149,
 	},
 
@@ -1327,7 +1331,7 @@
 			Common::kPlatformAmiga,
 		},
 		GType_V2,
-		AGI_AMIGA,
+		0,
 		0x2936,
 	},
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.