From 89a9a35a0ba7dde96d858da8b9f4f64794aedb58 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 20 Oct 2003 20:06:29 +0000
Subject: usage string has to be updated (as I explained in various commit
 messages and in #scummv, but it seems not everybody saw that :-)

svn-id: r10918
---
 README                | 2 ++
 base/gameDetector.cpp | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 2282bec507..e60173fe32 100644
--- a/README
+++ b/README
@@ -315,6 +315,8 @@ arguments - see the next section.
 
 5.1) Command Line Options:
 ---- ---------------------
+
+THIS NEEDS TO BE UPDATED
         scummvm [OPTIONS] [GAME]
 
         [GAME]           - Short name of game to load. For example, 'monkey' for
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index e2caebc04a..3b95223c1a 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -43,7 +43,8 @@ static const char USAGE_STRING[] = "NoUsageString"; // save more data segment sp
 #else
 static const char USAGE_STRING[] = 
 	"ScummVM - Graphical Adventure Game Interpreter\n"
-	"Syntax:\n"
+	"New USAGE_STRING is missing here!\n" 
+/*	"Syntax:\n"
 	"  scummvm [OPTIONS] [game]\n"
 	"Options:\n"
 	"  -p<path>       - Look for game in <path>\n"
@@ -90,6 +91,7 @@ static const char USAGE_STRING[] =
 	"\n"
 	"The meaning of long options can be inverted by prefixing them with \"no-\",\n"
 	"e.g. \"--no-aspect-ratio\".\n"
+*/
 ;
 #endif
 
@@ -411,7 +413,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) {
 				ConfMan.set("cdrom", (int)strtol(option, 0, 10));
 			END_OPTION
 	
-			DO_LONG_OPTION("joystick")
+			DO_LONG_OPTION_OPT("joystick")
 				ConfMan.set("joystick_num", (option != NULL) ? (int)strtol(option, 0, 10) : 0);
 			END_OPTION
 			
@@ -565,7 +567,7 @@ bool GameDetector::detectMain() {
 	}
 
 	if (!detectGame()) {
-		warning("%s is an invalid target. Use the -z parameter to list targets", _targetName.c_str());
+		warning("%s is an invalid target. Use the --list-targets option to list targets", _targetName.c_str());
 		return false;
 	}
 
-- 
cgit v1.2.3