Remove trailing whitespace from all .c and .h files.

[solanum.git] / extensions / m_roleplay.c

diff --git a/extensions/m_roleplay.c b/extensions/m_roleplay.c
index ee362246536dcd51cfa0045977fbec9ff195113d..0d439b0eb33727cb49ffe6030a4bf8f651ff2610 100644 (file)
--- a/extensions/m_roleplay.c
+++ b/extensions/m_roleplay.c
@@ -6,9 +6,9 @@
  * to clearly show that it is fake. SCENE is a special case and not underlined.
  * these commands only work on channels set +N
  *
- * also adds oper commands FSAY and FACTION, which are like NPC and NPCA 
+ * also adds oper commands FSAY and FACTION, which are like NPC and NPCA
  * except without the underline.
- * 
+ *
  * all of these messages have the hostmask npc.fakeuser.invalid, and their ident
  * is the nickname of the user running the commands.
  */
@@ -27,6 +27,7 @@
 #include "tgchange.h"
 #include "channel.h"
 #include "packet.h"
+#include "messages.h"
 
 static int m_scene(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static int m_fsay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
@@ -65,32 +66,32 @@ struct Message scene_msgtab = {
 struct Message ambiance_msgtab = {
        "AMBIANCE", 0, 0, 0, MFLG_SLOW,
        {mg_unreg, {m_scene, 3}, mg_ignore, mg_ignore, mg_ignore, {m_scene, 3}}
-};  
+};
 
 struct Message fsay_msgtab = {
        "FSAY", 0, 0, 0, MFLG_SLOW,
        {mg_unreg, {m_npc, 4}, mg_ignore, mg_ignore, mg_ignore, {m_fsay, 4}}
-};  
+};
 
 struct Message faction_msgtab = {
        "FACTION", 0, 0, 0, MFLG_SLOW,
        {mg_unreg, {m_npca, 4}, mg_ignore, mg_ignore, mg_ignore, {m_faction, 4}}
-};  
+};
 
 struct Message npc_msgtab = {
        "NPC", 0, 0, 0, MFLG_SLOW,
        {mg_unreg, {m_npc, 4}, mg_ignore, mg_ignore, mg_ignore, {m_npc, 4}}
-};  
+};
 
 struct Message npca_msgtab = {
        "NPCA", 0, 0, 0, MFLG_SLOW,
        {mg_unreg, {m_npca, 4}, mg_ignore, mg_ignore, mg_ignore, {m_npca, 4}}
-};  
+};
 
 struct Message roleplay_msgtab = {
        "ROLEPLAY", 0, 0, 0, MFLG_SLOW,
        {mg_ignore, mg_ignore, mg_ignore, mg_ignore, {me_roleplay, 4}, mg_ignore}
-};  
+};
 
 mapi_clist_av1 roleplay_clist[] = { &scene_msgtab, &ambiance_msgtab, &fsay_msgtab, &faction_msgtab, &npc_msgtab, &npca_msgtab, &roleplay_msgtab, NULL };
 
@@ -137,9 +138,12 @@ m_displaymsg(struct Client *source_p, const char *channel, int underline, int ac
        struct Channel *chptr;
        struct membership *msptr;
        char nick2[NICKLEN+1];
-       char *nick3 = rb_strdup(nick);
+       char nick3[NICKLEN+1];
+       char text3[BUFSIZE];
        char text2[BUFSIZE];
 
+       rb_strlcpy(nick3, nick, sizeof nick3);
+
        if(!IsFloodDone(source_p))
                flood_endgrace(source_p);
 
@@ -194,12 +198,14 @@ m_displaymsg(struct Client *source_p, const char *channel, int underline, int ac
                return 0;
        }
 
+       rb_snprintf(text3, sizeof(text3), "%s (%s)", text, source_p->name);
+
        if(action)
-               rb_snprintf(text2, sizeof(text2), "\1ACTION %s\1", text);
+               rb_snprintf(text2, sizeof(text2), "\1ACTION %s\1", text3);
        else
-               rb_snprintf(text2, sizeof(text2), "%s", text);
+               rb_snprintf(text2, sizeof(text2), "%s", text3);
 
-       sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@npc.fakeuser.invalid PRIVMSG %s :%s", nick2, source_p->name, channel, text2); 
+       sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@npc.fakeuser.invalid PRIVMSG %s :%s", nick2, source_p->name, channel, text2);
        sendto_match_servs(source_p, "*", CAP_ENCAP, NOCAPS, "ENCAP * ROLEPLAY %s %s :%s",
                        channel, nick2, text2);
        return 0;
@@ -215,6 +221,6 @@ me_roleplay(struct Client *client_p, struct Client *source_p, int parc, const ch
        if((chptr = find_channel(parv[1])) == NULL)
                return 0;
 
-       sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@npc.fakeuser.invalid PRIVMSG %s :%s", parv[2], source_p->name, parv[1], parv[3]); 
+       sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@npc.fakeuser.invalid PRIVMSG %s :%s", parv[2], source_p->name, parv[1], parv[3]);
        return 0;
 }