diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/composer/detection.cpp | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/composer/detection.cpp')
| -rw-r--r-- | engines/composer/detection.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp index 2ca00f9f53..af355402c2 100644 --- a/engines/composer/detection.cpp +++ b/engines/composer/detection.cpp @@ -63,8 +63,6 @@ static const PlainGameDescriptor composerGames[] = { namespace Composer { -using Common::GUIO_NONE; - static const ComposerGameDescription gameDescriptions[] = { // from Liam Finds a Story CD { @@ -75,7 +73,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_USEEXTRAASTITLE | ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV1 }, @@ -88,7 +86,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -102,7 +100,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_USEEXTRAASTITLE | ADGF_DEMO, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -119,7 +117,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -132,7 +130,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -145,7 +143,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::FR_FRA, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -162,7 +160,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -175,7 +173,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformMacintosh, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -188,7 +186,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -205,7 +203,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, @@ -222,7 +220,7 @@ static const ComposerGameDescription gameDescriptions[] = { Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, - Common::GUIO_NONE + GUIO1(GUIO_NOASPECT) }, GType_ComposerV2 }, |