thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Change --floppy-intro to --alt-intro patch (#896311)

Browse source 
svn-id: r12844
This commit is contained in:
Travis Howell 2004-02-13 10:51:33 +00:00
parent 0e24cabec8
commit adaeb61054
5 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README
View file

@ -364,7 +364,8 @@ arguments - see the next section.
--native-mt32 True Roland MT-32 (disable GM emulation) --native-mt32 True Roland MT-32 (disable GM emulation)
--aspect-ratio Enable aspect ratio correction --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 --copy-protection Enable copy protection in SCUMM games ,when
ScummVM disables it by default. ScummVM disables it by default.
--demo-mode Start demo mode of Maniac Mansion (Classic version) --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 copy_protection bool Enable copy protection in SCUMM games ,when
ScummVM disables it by default. ScummVM disables it by default.
demo_mode bool Start demo in Maniac Mansion (Classic version) demo_mode bool Start demo in Maniac Mansion (Classic version)
floppy_intro bool Use floppy version of introduction in Beneath alt_intro bool Use alternative intro for CD versions of
a Steel Sky (CD version) Beneath a Steel Sky and Flight of the Amazon
Queen
boot_param number Pass this number to the boot script boot_param number Pass this number to the boot script
debuglevel number Enable debug output. The higher number, the debuglevel number Enable debug output. The higher number, the

15
base/gameDetector.cpp
View file

@ -79,8 +79,9 @@ static const char USAGE_STRING[] =
" --native-mt32 True Roland MT-32 (disable GM emulation)\n" " --native-mt32 True Roland MT-32 (disable GM emulation)\n"
" --aspect-ratio Enable aspect ratio correction\n" " --aspect-ratio Enable aspect ratio correction\n"
"\n" "\n"
#ifndef DISABLE_SKY #if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
" --floppy-intro Use floppy version intro for Beneath a Steel Sky CD\n" " --alt-intro Use alternative intro for CD versions of Beneath a\n"
" Steel Sky and Flight of the Amazon Queen\n"
#endif #endif
#ifndef DISABLE_SCUMM #ifndef DISABLE_SCUMM
" --copy-protection Enable the original copy protection in SCUMM games\n" " --copy-protection Enable the original copy protection in SCUMM games\n"
@ -136,8 +137,8 @@ GameDetector::GameDetector() {
ConfMan.registerDefault("tempo", 0); ConfMan.registerDefault("tempo", 0);
#endif #endif
#ifndef DISABLE_SKY #if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
ConfMan.registerDefault("floppy_intro", false); ConfMan.registerDefault("alt_intro", false);
#endif #endif
// Miscellaneous // Miscellaneous
@ -439,9 +440,9 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
END_OPTION END_OPTION
#endif #endif
#ifndef DISABLE_SKY #if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
DO_LONG_OPTION_BOOL("floppy-intro") DO_LONG_OPTION_BOOL("alt-intro")
ConfMan.set("floppy_intro", cmdValue, kTransientDomain); ConfMan.set("alt_intro", cmdValue, kTransientDomain);
END_OPTION END_OPTION
#endif #endif

3
doc/05_01.tex
View file

@ -37,7 +37,8 @@ Usage: scummvm [OPTIONS]... [GAME]\\
--native-mt32 &True Roland MT-32 (disable GM emulation)\\ --native-mt32 &True Roland MT-32 (disable GM emulation)\\
--aspect-ratio &Enable aspect ratio correction\\ --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\\ --copy-protection &Enable copy protection in SCUMM games, when\\
&ScummVM disables it by default.\\ &ScummVM disables it by default.\\
--demo-mode &Start demo mode of Maniac Mansion (Classic version)\\ --demo-mode &Start demo mode of Maniac Mansion (Classic version)\\

5
doc/08.tex
View file

@ -105,8 +105,9 @@ The following keywords are recognized:
copy\_protection&bool Enable copy protection in SCUMM games ,when\\ copy\_protection&bool Enable copy protection in SCUMM games ,when\\
& ScummVM disables it by default.\\ & ScummVM disables it by default.\\
demo\_mode &bool Start demo in Maniac Mansion (Classic version)\\ demo\_mode &bool Start demo in Maniac Mansion (Classic version)\\
floppy\_intro &bool Use floppy version of introduction in Beneath\\ alt\_intro &bool Use alternative intro for CD versions of \\
& a Steel Sky (CD version)\\ & Beneath a Steel Sky and Flight of the Amazon\\
& Queen
\\ \\
boot\_param &number Pass this number to the boot script\\ boot\_param &number Pass this number to the boot script\\
debuglevel &number Enable debug output. The higher number, the\\ debuglevel &number Enable debug output. The higher number, the\\

2
sky/sky.cpp
View file

@ -123,7 +123,7 @@ SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
_debugMode = ConfMan.hasKey("debuglevel"); _debugMode = ConfMan.hasKey("debuglevel");
_floppyIntro = ConfMan.getBool("floppy_intro"); _floppyIntro = ConfMan.getBool("alt_intro");
_fastMode = 0; _fastMode = 0;