aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorTravis Howell2004-02-13 10:51:33 +0000
committerTravis Howell2004-02-13 10:51:33 +0000
commitadaeb61054fa9fb451da6be46fb451f5ab9c4c32 (patch)
tree90feb28ca94fe0375d1dd87d42f69b24d5c238a0 /base
parent0e24cabec85c797d2e2d2edf7d3102457bac1b54 (diff)
downloadscummvm-rg350-adaeb61054fa9fb451da6be46fb451f5ab9c4c32.tar.gz
scummvm-rg350-adaeb61054fa9fb451da6be46fb451f5ab9c4c32.tar.bz2
scummvm-rg350-adaeb61054fa9fb451da6be46fb451f5ab9c4c32.zip
Add Change --floppy-intro to --alt-intro patch (#896311)
svn-id: r12844
Diffstat (limited to 'base')
-rw-r--r--base/gameDetector.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 340184e589..c2b31c3bb2 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -79,8 +79,9 @@ static const char USAGE_STRING[] =
" --native-mt32 True Roland MT-32 (disable GM emulation)\n"
" --aspect-ratio Enable aspect ratio correction\n"
"\n"
-#ifndef DISABLE_SKY
- " --floppy-intro Use floppy version intro for Beneath a Steel Sky CD\n"
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+ " --alt-intro Use alternative intro for CD versions of Beneath a\n"
+ " Steel Sky and Flight of the Amazon Queen\n"
#endif
#ifndef DISABLE_SCUMM
" --copy-protection Enable the original copy protection in SCUMM games\n"
@@ -136,8 +137,8 @@ GameDetector::GameDetector() {
ConfMan.registerDefault("tempo", 0);
#endif
-#ifndef DISABLE_SKY
- ConfMan.registerDefault("floppy_intro", false);
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+ ConfMan.registerDefault("alt_intro", false);
#endif
// Miscellaneous
@@ -439,9 +440,9 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
END_OPTION
#endif
-#ifndef DISABLE_SKY
- DO_LONG_OPTION_BOOL("floppy-intro")
- ConfMan.set("floppy_intro", cmdValue, kTransientDomain);
+#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
+ DO_LONG_OPTION_BOOL("alt-intro")
+ ConfMan.set("alt_intro", cmdValue, kTransientDomain);
END_OPTION
#endif