From c3f4bbf34fe5192fe5bccd87c4319a42e1109422 Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Sun, 12 Oct 2003 18:24:28 +0000
Subject: [PATCH] removing last traces of -w/-l

svn-id: r10765
---
 README                |  2 --
 base/gameDetector.cpp | 34 ----------------------------------
 2 files changed, 36 deletions(-)

diff --git a/README b/README
index 20ded23d518..2282bec5077 100644
--- a/README
+++ b/README
@@ -335,8 +335,6 @@ arguments - see the next section.
         -t<num>         - Set music tempo. 50-200. Default is '100' (percent)
         -n              - Disable subtitles. Use with games that have voice.
         -y              - Set talk speed ('yak option'). Default is '60'
-        -l<file>        - Load alternate configuration file
-        -w[file]        - Write configuration file
         -v              - Show version information and exit
         -z              - Display list of games
         -b<num>         - Pass number to the boot script (boot param)
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 89a2673dea7..9f4d5d44997 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -89,14 +89,6 @@ static const char USAGE_STRING[] =
 	"  -y             - Set text speed (default: 60)\n"
 #endif
 	"\n"
-/* FIXME / TODO: config rewrite
-	"  -l<file>       - Load config file instead of default\n"
-#if defined(UNIX)
-	"  -w[file]       - Write to config file [~/.scummvmrc]\n"
-#else
-	"  -w[file]       - Write to config file [scummvm.ini]\n"
-#endif
-*/
 	"  -v             - Show version info and exit\n"
 	"  -h             - Display this text and exit\n"
 	"  -z             - Display list of supported games\n"
@@ -359,18 +351,6 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
 				HANDLE_OPT_OPTION();
 				ConfMan.set("joystick_num", (option != NULL) ? (int)strtol(option, 0, 10) : 0);
 				break;
-/* FIXME / TODO: config rewrite
-			case 'l':
-				HANDLE_OPTION();
-				{
-					Config *newconfig = new Config(option, "scummvm");
-					g_config->merge_config(*newconfig);
-					delete newconfig;
-					updateconfig();
-					break;
-				}
-				break;
-*/
 			case 'm':
 				HANDLE_OPTION();
 				ConfMan.set("music_volume", (int)strtol(option, 0, 10));
@@ -416,15 +396,6 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
 				printf("%s\n", gScummVMFullVersion);
 				exit(0);
 				break;
-/* FIXME / TODO: config rewrite
-			case 'w':
-				_saveconfig = true;
-				g_config->set_writing(true);
-				HANDLE_OPT_OPTION();
-				if (option != NULL)
-					g_config->set_filename(option);
-				break;
-*/
 			case 'x':
 				HANDLE_OPT_OPTION();
 				ConfMan.set("save_slot", (option != NULL) ? (int)strtol(option, 0, 10) : 0);
@@ -497,11 +468,6 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
 		}
 	}
 	
-/* FIXME / TODO: config rewrite
-	if (!_gameFileName.isEmpty())
-		ConfMan.flushToDisk();
-*/
-
 	return;
 
 ShowHelpAndExit: