PennMUSH 1.8.3p11

commit 4319b29f0850305e33469a404b2501b836980de8
Author: talvo@talvo.com
<talvo@talvo.com@ba372814-4f39-11de-9ad6-1127a62b9fcd>
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

diff --git a/hdrs/dbdefs.h b/hdrs/dbdefs.h
index fbe26f38053a50ced634000b0981c1d1b3b201df..3675556cbf256123df0eeacb1d5e67ddfdf4924e 100644 (file)
--- 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 a674dfbdec6d433cf854bbaf1e420959b2c15da1..498c5f1f7ff9461f1c109a960bbf40e0797b6326 100644 (file)
--- 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 d2acff8fd70be4af42138aa57af0948c38b83264..a2f7c58ac9d5767f0433b1f2c963a9cc5bbfec72 100644 (file)
--- 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