From 32972a5ffb180c9e8a6a9eae51d0e7564ce76d9e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 23 Oct 2011 17:52:43 +0100
Subject: AD: Switched rest of the engines to new GUIO

---
 engines/sword25/detection.cpp      |  2 +-
 engines/sword25/detection_tables.h | 25 ++++++++++---------------
 2 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'engines/sword25')

diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp
index 25a3df167b..06e4ba2a7d 100644
--- a/engines/sword25/detection.cpp
+++ b/engines/sword25/detection.cpp
@@ -44,7 +44,7 @@ static const char *directoryGlobs[] = {
 class Sword25MetaEngine : public AdvancedMetaEngine {
 public:
 	Sword25MetaEngine() : AdvancedMetaEngine(Sword25::gameDescriptions, sizeof(ADGameDescription), sword25Game) {
-		_guioptions = Common::GUIO_NOMIDI;
+		_guioptions = GUIO1(GUIO_NOMIDI);
 		_maxScanDepth = 2;
 		_directoryGlobs = directoryGlobs;
 	}
diff --git a/engines/sword25/detection_tables.h b/engines/sword25/detection_tables.h
index fe9e6e7934..5e0473dee5 100644
--- a/engines/sword25/detection_tables.h
+++ b/engines/sword25/detection_tables.h
@@ -22,11 +22,6 @@
 
 namespace Sword25 {
 
-using Common::GUIO_NONE;
-using Common::GUIO_NOSPEECH;
-using Common::GUIO_NOSFX;
-using Common::GUIO_NOMUSIC;
-
 static const ADGameDescription gameDescriptions[] = {
 	{
 		"sword25",
@@ -35,7 +30,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::EN_ANY,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	{
 		"sword25",
@@ -44,7 +39,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::FR_FRA,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	{
 		"sword25",
@@ -53,7 +48,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::DE_DEU,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	{
 		"sword25",
@@ -62,7 +57,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::HU_HUN,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	{
 		"sword25",
@@ -71,7 +66,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::IT_ITA,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	{
 		"sword25",
@@ -80,7 +75,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::PL_POL,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	{
 		"sword25",
@@ -89,7 +84,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::PT_BRA,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	{
 		"sword25",
@@ -98,7 +93,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::RU_RUS,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	{
 		"sword25",
@@ -107,7 +102,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::ES_ESP,
 		Common::kPlatformUnknown,
 		ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 
 	// Extracted version
@@ -121,7 +116,7 @@ static const ADGameDescription gameDescriptions[] = {
 		Common::EN_ANY,
 		Common::kPlatformUnknown,
 		GF_EXTRACTED | ADGF_UNSTABLE,
-		Common::GUIO_NONE
+		GUIO1(GUIO_NONE)
 	},
 	AD_TABLE_END_MARKER
 };
-- 
cgit v1.2.3