aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README9
-rw-r--r--common/gameDetector.cpp7
2 files changed, 12 insertions, 4 deletions
diff --git a/README b/README
index c23c156c50..ce6aa6b781 100644
--- a/README
+++ b/README
@@ -364,7 +364,7 @@ Command Line Options:
-p<path> - Path to where the game is installed. Default is CWD.
-x[<num>] - Save game slot to load (default: autosave)
- -f - Full-screen mode.
+ -f - Full-screen mode. (-F forces window mode.)
-g<mode> - Select graphics scaler. See below.
-e<mode> - Select sound engine. See below.
-a - Enable amiga pal conversion, for playing Amiga
@@ -385,9 +385,10 @@ Command Line Options:
-d[<num>] - Set debug verbosity to <num>
-u - Dump scripts if a directory called 'dumps' exists in
current directory
- --multi-midi - enable combination Adlib and native MIDI
- --native-mt32 - true Roland MT-32 (disable GM emulation)
- --aspect-ratio - enable aspect ratio correction
+ --multi-midi - Enable combination Adlib and native MIDI
+ --native-mt32 - True Roland MT-32 (disable GM emulation)
+ --fullscreen - Full-screen mode (same as -f)
+ --aspect-ratio - Enable aspect ratio correction
--demo-mode - Start demo mode of Maniac Mansion (Classic version)
--floppy-intro - Use floppy version intro for Beneath a Steel Sky CD
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index e1a796933e..b2c371ab5d 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -399,6 +399,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
case 'f':
CHECK_OPTION();
_fullScreen = (c == 'f');
+ g_config->setBool("fullscreen", _fullScreen);
g_config->setBool("fullscreen", _fullScreen, "scummvm");
break;
case 'g':
@@ -406,6 +407,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
_gfx_mode = parseGraphicsMode(option);
if (_gfx_mode == -1)
goto ShowHelpAndExit;
+ g_config->set("gfx_mode", option);
g_config->set("gfx_mode", option, "scummvm");
break;
// case 'h': reserved for help
@@ -500,6 +502,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
s += 3;
} else
long_option_value = true;
+
if (!strcmp (s, "multi-midi")) {
_multi_midi = long_option_value;
g_config->setBool ("multi_midi", _multi_midi);
@@ -509,6 +512,10 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
} else if (!strcmp (s, "aspect-ratio")) {
_aspectRatio = long_option_value;
g_config->setBool ("aspect_ratio", _aspectRatio);
+ } else if (!strcmp (s, "fullscreen")) {
+ _fullScreen = long_option_value;
+ g_config->setBool("fullscreen", _fullScreen);
+ g_config->setBool("fullscreen", _fullScreen, "scummvm");
#ifndef DISABLE_SCUMM
} else if (!strcmp (s, "demo-mode")) {
_demo_mode = long_option_value;