[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.21,1.22

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv25738/base

Modified Files:
	gameDetector.cpp 
Log Message:
removing last traces of -w/-l

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gameDetector.cpp	10 Oct 2003 14:12:01 -0000	1.21
+++ gameDetector.cpp	12 Oct 2003 18:24:28 -0000	1.22
@@ -89,14 +89,6 @@
 	"  -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 @@
 				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 @@
 				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 @@
 		}
 	}
 	
-/* FIXME / TODO: config rewrite
-	if (!_gameFileName.isEmpty())
-		ConfMan.flushToDisk();
-*/
-
 	return;
 
 ShowHelpAndExit: