diff options
author | Travis Howell | 2004-02-13 10:51:33 +0000 |
---|---|---|
committer | Travis Howell | 2004-02-13 10:51:33 +0000 |
commit | adaeb61054fa9fb451da6be46fb451f5ab9c4c32 (patch) | |
tree | 90feb28ca94fe0375d1dd87d42f69b24d5c238a0 | |
parent | 0e24cabec85c797d2e2d2edf7d3102457bac1b54 (diff) | |
download | scummvm-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
-rw-r--r-- | README | 8 | ||||
-rw-r--r-- | base/gameDetector.cpp | 15 | ||||
-rw-r--r-- | doc/05_01.tex | 3 | ||||
-rw-r--r-- | doc/08.tex | 5 | ||||
-rw-r--r-- | sky/sky.cpp | 2 |
5 files changed, 19 insertions, 14 deletions
@@ -364,7 +364,8 @@ arguments - see the next section. --native-mt32 True Roland MT-32 (disable GM emulation) --aspect-ratio Enable aspect ratio correction - --floppy-intro Use floppy version intro for Beneath a Steel Sky CD + --alt-intro Use alternative intro for CD versions of Beneath a + Steel Sky and Flight of the Amazon Queen --copy-protection Enable copy protection in SCUMM games ,when ScummVM disables it by default. --demo-mode Start demo mode of Maniac Mansion (Classic version) @@ -879,8 +880,9 @@ The following keywords are recognized: copy_protection bool Enable copy protection in SCUMM games ,when ScummVM disables it by default. demo_mode bool Start demo in Maniac Mansion (Classic version) - floppy_intro bool Use floppy version of introduction in Beneath - a Steel Sky (CD version) + alt_intro bool Use alternative intro for CD versions of + Beneath a Steel Sky and Flight of the Amazon + Queen boot_param number Pass this number to the boot script debuglevel number Enable debug output. The higher number, the 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 diff --git a/doc/05_01.tex b/doc/05_01.tex index 810446adf1..971c679e7b 100644 --- a/doc/05_01.tex +++ b/doc/05_01.tex @@ -37,7 +37,8 @@ Usage: scummvm [OPTIONS]... [GAME]\\ --native-mt32 &True Roland MT-32 (disable GM emulation)\\ --aspect-ratio &Enable aspect ratio correction\\ \\ - --floppy-intro &Use floppy version intro for Beneath a Steel Sky CD\\ + --alt-intro &Use alternative intro for CD versions of Beneath a\\ + &Steel Sky and Flight of the Amazon Queen\\ --copy-protection &Enable copy protection in SCUMM games, when\\ &ScummVM disables it by default.\\ --demo-mode &Start demo mode of Maniac Mansion (Classic version)\\ diff --git a/doc/08.tex b/doc/08.tex index c48f78757a..329fcd9894 100644 --- a/doc/08.tex +++ b/doc/08.tex @@ -105,8 +105,9 @@ The following keywords are recognized: copy\_protection&bool Enable copy protection in SCUMM games ,when\\ & ScummVM disables it by default.\\ demo\_mode &bool Start demo in Maniac Mansion (Classic version)\\ - floppy\_intro &bool Use floppy version of introduction in Beneath\\ - & a Steel Sky (CD version)\\ + alt\_intro &bool Use alternative intro for CD versions of \\ + & Beneath a Steel Sky and Flight of the Amazon\\ + & Queen \\ boot\_param &number Pass this number to the boot script\\ debuglevel &number Enable debug output. The higher number, the\\ diff --git a/sky/sky.cpp b/sky/sky.cpp index 08d7b40c1c..5556e1c500 100644 --- a/sky/sky.cpp +++ b/sky/sky.cpp @@ -123,7 +123,7 @@ SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst) _debugMode = ConfMan.hasKey("debuglevel"); - _floppyIntro = ConfMan.getBool("floppy_intro"); + _floppyIntro = ConfMan.getBool("alt_intro"); _fastMode = 0; |