[Scummvm-cvs-logs] SF.net SVN: scummvm: [22519] scummvm/trunk/doc
sev at users.sourceforge.net
sev at users.sourceforge.net
Thu May 18 07:01:04 CEST 2006
Revision: 22519
Author: sev
Date: 2006-05-18 06:59:20 -0700 (Thu, 18 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22519&view=rev
Log Message:
-----------
--force-1x-overlay is no more. Remove leftovers.
Modified Paths:
--------------
scummvm/trunk/backends/psp/psp_main.cpp
scummvm/trunk/base/commandLine.cpp
scummvm/trunk/doc/running-options.tex
scummvm/trunk/engines/scumm/scumm.cpp
Modified: scummvm/trunk/backends/psp/psp_main.cpp
===================================================================
--- scummvm/trunk/backends/psp/psp_main.cpp 2006-05-18 13:58:33 UTC (rev 22518)
+++ scummvm/trunk/backends/psp/psp_main.cpp 2006-05-18 13:59:20 UTC (rev 22519)
@@ -133,7 +133,7 @@
sceIoDclose(fd);
}
- static char *argv[] = { "scummvm", "--force-1x-overlay", NULL };
+ static char *argv[] = { "scummvm", NULL };
static int argc = sizeof(argv)/sizeof(char *)-1;
g_system = new OSystem_PSP_GU();
Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp 2006-05-18 13:58:33 UTC (rev 22518)
+++ scummvm/trunk/base/commandLine.cpp 2006-05-18 13:59:20 UTC (rev 22519)
@@ -116,7 +116,6 @@
" --aspect-ratio Enable aspect ratio correction\n"
" --render-mode=MODE Enable additional render modes (cga, ega, hercGreen,\n"
" hercAmber, amiga)\n"
- " --force-1x-overlay Make inner GUI 320x200\n"
"\n"
#if !defined(DISABLE_SKY) || !defined(DISABLE_QUEEN)
" --alt-intro Use alternative intro for CD versions of Beneath a\n"
@@ -165,13 +164,7 @@
ConfMan.registerDefault("aspect_ratio", false);
ConfMan.registerDefault("gfx_mode", "normal");
ConfMan.registerDefault("render_mode", "default");
-#if defined(__SYMBIAN32__)
- ConfMan.registerDefault("force_1x_overlay", true);
-#else
- ConfMan.registerDefault("force_1x_overlay", false);
-#endif
-
// Sound & Music
ConfMan.registerDefault("music_volume", 192);
ConfMan.registerDefault("sfx_volume", 192);
@@ -476,9 +469,6 @@
usage("Unrecognized render mode '%s'", option);
END_OPTION
- DO_LONG_OPTION_BOOL("force-1x-overlay")
- END_OPTION
-
DO_LONG_OPTION("savepath")
// TODO: Verify whether the path is valid
END_OPTION
Modified: scummvm/trunk/doc/running-options.tex
===================================================================
--- scummvm/trunk/doc/running-options.tex 2006-05-18 13:58:33 UTC (rev 22518)
+++ scummvm/trunk/doc/running-options.tex 2006-05-18 13:59:20 UTC (rev 22519)
@@ -48,7 +48,6 @@
--render-mode=MODE &Enable additional render modes (cga, ega, hercGreen,\\
&hercAmber, amiga)\\
\\
- --force-1x-overlay &Make inner GUI 320x200\\
--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 games, when\\
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2006-05-18 13:58:33 UTC (rev 22518)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2006-05-18 13:59:20 UTC (rev 22519)
@@ -954,11 +954,6 @@
_system->initSize(Common::kHercW, Common::kHercH);
defaultTo1XScaler = true;
} else {
- // FIXME: The way we now handle the force_1x_overlay setting implies
- // that if you start scummvm into the launcher with force_1x_overlay
- // set to true, it'll get reset to the default value (usually 'false'
- // except for Symbian) before launching a game.
- // This may or may not be the desired behavior...
_system->initSize(_screenWidth, _screenHeight);
defaultTo1XScaler = (_screenWidth > 320);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list