From a3b616b24edcf11d91ec628d986e20687eeb51ee Mon Sep 17 00:00:00 2001 From: Rick L Bird Date: Thu, 5 May 2011 19:11:42 -0400 Subject: [PATCH] PennMUSH 1.8.3p11 commit 4319b29f0850305e33469a404b2501b836980de8 Author: talvo@talvo.com Date: Sun Nov 1 03:15:33 2009 +0000 PennIssue 129, carry over ANSI in @listens PennIssue 130, fix executor and nospoof when using the /spoof switch for @message, @pemit, etc. Hopefully. Fixes #162 Fixes #157 --- hdrs/dbdefs.h | 2 +- src/cmds.c | 2 ++ src/notify.c | 14 ++++---------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/hdrs/dbdefs.h b/hdrs/dbdefs.h index fbe26f3..3675556 100644 --- a/hdrs/dbdefs.h +++ b/hdrs/dbdefs.h @@ -354,6 +354,6 @@ extern const char *EOD; #define SPOOF(player, cause, sw) \ if (SW_ISSET(sw, SWITCH_SPOOF) && (controls(player, cause) || Can_Nspemit(player))) \ - player = cause; + player = cause; orator = cause; #endif /* __DBDEFS_H */ diff --git a/src/cmds.c b/src/cmds.c index a674dfb..498c5f1 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -748,6 +748,8 @@ COMMAND(cmd_message) if (!(SW_ISSET(sw, SWITCH_SPOOF) && (controls(player, cause) || Can_Nspemit(player)))) { cause = player; + } else { + orator = cause; } for (numargs = 1; args_right[numargs] && numargs < 13; numargs++) ; diff --git a/src/notify.c b/src/notify.c index d2acff8..a2f7c58 100644 --- a/src/notify.c +++ b/src/notify.c @@ -880,12 +880,6 @@ notify_anything_loc(dbref speaker, na_lookup func, || IsExit(target)) continue; -#ifdef RPMODE_SYS - /* Do ICFUNCS related rplogging crapp */ - if(has_flag_by_name(target, "ICFUNCS", TYPE_ROOM)) - rplog_room(target, speaker, (char *) notify_makestring(msgbuf, messages, NA_ASCII)); -#endif /* RPMODE_SYS */ - /* do @listen stuff */ a = atr_get_noparent(target, "LISTEN"); if (a) { @@ -898,12 +892,12 @@ notify_anything_loc(dbref speaker, na_lookup func, if (AF_Regexp(a) ? regexp_match_case_r(tbuf1, (char *) notify_makestring(msgbuf, messages, - NA_ASCII), + NA_COLOR), AF_Case(a), global_eval_context.wnxt, 10, match_space, match_space_len) : wild_match_case_r(tbuf1, (char *) notify_makestring(msgbuf, messages, - NA_ASCII), + NA_COLOR), AF_Case(a), global_eval_context.wnxt, 10, match_space, match_space_len)) { if (eval_lock(speaker, target, Listen_Lock)) @@ -917,7 +911,7 @@ notify_anything_loc(dbref speaker, na_lookup func, if (!(flags & NA_NORELAY) && (loc != target) && !filter_found(target, (char *) notify_makestring(msgbuf, messages, - NA_ASCII), 1)) { + NA_COLOR), 1)) { passalong[0] = target; passalong[1] = target; passalong[2] = Owner(target); @@ -957,7 +951,7 @@ notify_anything_loc(dbref speaker, na_lookup func, && eval_lock(speaker, target, Listen_Lock) ) atr_comm_match(target, speaker, '^', ':', - (char *) notify_makestring(msgbuf, messages, NA_ASCII), 0, 1, + (char *) notify_makestring(msgbuf, messages, NA_COLOR), 0, 1, NULL, NULL, NULL); /* If object is flagged AUDIBLE and has a @FORWARDLIST, send -- 2.30.2