From 5a4003f31b0c8edeffa2e41602c4dedf2cc85d91 Mon Sep 17 00:00:00 2001
From: skyjake <skyjake@3894b877-cc0d-0410-b400-92b7ed5dc389>
Date: Fri, 23 May 2003 22:07:17 +0000
Subject: [PATCH] Added ArgRecognize

---
 doomsday/Src/m_args.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/doomsday/Src/m_args.c b/doomsday/Src/m_args.c
index 93646cab91..bea71ec7bb 100644
--- a/doomsday/Src/m_args.c
+++ b/doomsday/Src/m_args.c
@@ -253,6 +253,27 @@ char * ArgNext(void)
 	return args[++last_match];
 }
 
+//===========================================================================
+// ArgRecognize
+//	Returns true if the two parameters are equivalent according to the
+//	abbreviations.
+//===========================================================================
+int ArgRecognize(char *first, char *second)
+{
+	int k;
+
+	// A simple match?
+	if(!stricmp(first, second)) return true;
+
+	for(k = 0; k < num_names; k++)
+	{
+		if(stricmp(first, names[k]->long_name)) continue;
+		// names[k] now matches the first string.
+		if(!stricmp(names[k]->short_name, second)) return true;
+	}
+	return false;
+}
+
 //==========================================================================
 // ArgCheck
 //	Checks for the given parameter in the program's command line arguments.
@@ -260,20 +281,13 @@ char * ArgNext(void)
 //==========================================================================
 int ArgCheck(char *check)
 {
-	int i, k;
+	int i;
 
 	for(i = 1; i < num_args; i++)
 	{
-		if(!stricmp(check, args[i])) 
+		// Check the short names for this arg, too.
+		if(ArgRecognize(check, args[i]))
 			return last_match = i;
-		
-		// Check the short names for this arg.
-		for(k = 0; k < num_names; k++)
-		{
-			if(stricmp(check, names[k]->long_name)) continue;
-			if(!stricmp(names[k]->short_name, args[i]))
-				return last_match = i;
-		}
 	}
 	return last_match = 0;
 }