aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25
diff options
context:
space:
mode:
authorEugene Sandulenko2011-10-23 17:52:43 +0100
committerEugene Sandulenko2011-10-23 17:53:13 +0100
commit32972a5ffb180c9e8a6a9eae51d0e7564ce76d9e (patch)
tree052e527c673bc82a9f8ebccd4f3bd1a43e46579a /engines/sword25
parent77c65648b1db8f8b7b245510681eafd856798d26 (diff)
downloadscummvm-rg350-32972a5ffb180c9e8a6a9eae51d0e7564ce76d9e.tar.gz
scummvm-rg350-32972a5ffb180c9e8a6a9eae51d0e7564ce76d9e.tar.bz2
scummvm-rg350-32972a5ffb180c9e8a6a9eae51d0e7564ce76d9e.zip
AD: Switched rest of the engines to new GUIO
Diffstat (limited to 'engines/sword25')
-rw-r--r--engines/sword25/detection.cpp2
-rw-r--r--engines/sword25/detection_tables.h25
2 files changed, 11 insertions, 16 deletions
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
};