[mw-devel] MW3 r1123 - in branches/nomud: . src

[welshbyte at sucs.org]

Author: welshbyte
Date: 2009-12-10 13:11:58 +0000 (Thu, 10 Dec 2009)
New Revision: 1123

Modified:
   branches/nomud/
   branches/nomud/src/chattable.c
   branches/nomud/src/uri.c
Log:
Merge latest trunk changes into nomud


Property changes on: branches/nomud
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:1115-1122

Modified: branches/nomud/src/chattable.c
===================================================================
--- branches/nomud/src/chattable.c	2009-12-10 12:34:50 UTC (rev 1122)
+++ branches/nomud/src/chattable.c	2009-12-10 13:11:58 UTC (rev 1123)
@@ -72,7 +72,7 @@
 {"ungag"	,0x0002	,1, "Usage: ungag <user>", "Remove the Gag on the user", t_ungag, 1},
 {"unignore"	,0x0000	,1, "Usage: unignore <user>", "Stop filtering user out so you can hear them", t_unignore, 1},
 {"unprotect"	,0x0020	,1, "Usage: unprotect <user>", "Remove protection from user", t_unprotect, 1},
-{"uri"		,0x0000	,0, "Usage: uri [list [all|username] [n] | delete <id> | nsfw <id> | membersonly <id> | anonymous <id> | displaymode <full|short>]", "View/Edit the uris in the mwuri database", t_uri, 1},
+{"uri"		,0x0000	,0, "Usage: uri [list [*|username] [n] | delete <id> | nsfw <id> | membersonly <id> | anonymous <id> | displaymode <full|short>]", "View/Edit the uris in the mwuri database", t_uri, 1},
 {"variables"	,0x0200	,0, "Usage: variables [mask]", "List script variables + contents [or starting with mask]", t_showvars, 1},
 {"what"		,0x0000	,0, "Usage: what", "See peoples status", t_what, 1},
 {"whisper"	,0x0000	,2, "Usage: whisper <user> <message>", "Send a message to a single user", t_whisper, 1},

Modified: branches/nomud/src/uri.c
===================================================================
--- branches/nomud/src/uri.c	2009-12-10 12:34:50 UTC (rev 1122)
+++ branches/nomud/src/uri.c	2009-12-10 13:11:58 UTC (rev 1123)
@@ -84,13 +84,16 @@
 	uriFlagList *fl = uriflagtable;
 
 	flagstr[0] = '\0';
-	while(fl->flag)
+	if(shortflags != NULL)
 	{
-		if(strcasestr(shortflags,  fl->flagstr))
+		while(fl->flag)
 		{
-			n += snprintf(&flagstr[n], len-n, " %s", fl->list_desc);
+			if(strcasestr(shortflags,  fl->flagstr))
+			{
+				n += snprintf(&flagstr[n], len-n, " %s", fl->list_desc);
+			}
+			fl++;
 		}
-		fl++;
 	}
 }