From 18870908b1fe51bb8f7227b54f76d46f6259d707 Mon Sep 17 00:00:00 2001 From: Rick Bird Date: Fri, 25 Mar 2011 15:07:49 -0400 Subject: [PATCH] PennMUSH Incorporation 182p3 - Misc not mentioned by changes file - index function in *who() functions changed to strchr - ifdef'd out code for chat quote stripping --- src/bsd.c | 4 ++-- src/command.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bsd.c b/src/bsd.c index b33e50c..f2efb8b 100644 --- a/src/bsd.c +++ b/src/bsd.c @@ -4133,7 +4133,7 @@ FUNCTION(fun_lwho) int start, count; int powered = !(strchr(called_as, 'M') != NULL) && Priv_Who(executor); int xwho = *called_as == 'X'; - int objid = (index(called_as, 'D') != NULL); + int objid = (strchr(called_as, 'D') != NULL); first = 1; if(!xwho && nargs && args[0] && *args[0]) { @@ -4375,7 +4375,7 @@ FUNCTION(fun_zwho) dbref zone, victim; int first; int powered = (strcmp(called_as, "ZMWHO") && Priv_Who(executor)); - int objid = (index(called_as, 'D') != NULL); + int objid = (strchr(called_as, 'D') != NULL); first = 1; zone = match_thing(executor, args[0]); diff --git a/src/command.c b/src/command.c index 56819eb..0f85646 100644 --- a/src/command.c +++ b/src/command.c @@ -910,8 +910,11 @@ command_parse(dbref player, dbref cause, dbref realcause, char *string, int from return NULL; case SAY_TOKEN: replacer = "SAY"; +#if 0 + /* Messes up hooks when chat_strip_quote is yes. See bug #6677 */ if (CHAT_STRIP_QUOTE) p--; /* Since 'say' strips out the '"' */ +#endif break; case POSE_TOKEN: replacer = "POSE"; -- 2.30.2