From 9e3b78e1e988ec042ab8b20b27246ccf6ba73614 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 18 May 2006 13:59:20 +0000
Subject: --force-1x-overlay is no more. Remove leftovers.

svn-id: r22519
---
 backends/psp/psp_main.cpp |  2 +-
 base/commandLine.cpp      | 10 ----------
 doc/running-options.tex   |  1 -
 engines/scumm/scumm.cpp   |  5 -----
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/backends/psp/psp_main.cpp b/backends/psp/psp_main.cpp
index 64b48dc30e..b1b976cbb9 100644
--- a/backends/psp/psp_main.cpp
+++ b/backends/psp/psp_main.cpp
@@ -133,7 +133,7 @@ int main(void)
 		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();
diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 2d63a8f210..fd2284da7a 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -116,7 +116,6 @@ static const char HELP_STRING[] =
 	"  --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,12 +164,6 @@ void registerDefaults() {
 	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);
@@ -476,9 +469,6 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, char **ar
 					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
diff --git a/doc/running-options.tex b/doc/running-options.tex
index 212fcbbc78..bf7e87990a 100644
--- a/doc/running-options.tex
+++ b/doc/running-options.tex
@@ -48,7 +48,6 @@ Usage: scummvm [OPTIONS]... [GAME]\\
   --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\\
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 0c79a0b109..98dfb2c446 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -954,11 +954,6 @@ int ScummEngine::init() {
 			_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);
 		}
-- 
cgit v1.2.3