X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/551241607041c874f24f5be43d0aa3210740ed08..3c7d6fcce7a021ea7c4948a37a32aeca072e5b10:/extensions/m_roleplay.c

diff --git a/extensions/m_roleplay.c b/extensions/m_roleplay.c
index 73ae6218..d69efa92 100644
--- a/extensions/m_roleplay.c
+++ b/extensions/m_roleplay.c
@@ -29,13 +29,16 @@
 #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[]);
-static int m_faction(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_npc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_npca(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int m_displaymsg(struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text);
-static int me_roleplay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static const char roleplay_desc[] =
+	"Adds a roleplaying system that allows faked nicknames to talk in a channel set +N";
+
+static void m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void m_fsay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void m_faction(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void m_npc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void m_npca(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void m_displaymsg(struct MsgBuf *msgbuf_p, struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text);
+static void me_roleplay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static unsigned int mymode;
 
 static int
@@ -58,82 +61,77 @@ _moddeinit(void)
 
 
 struct Message scene_msgtab = {
-	"SCENE", 0, 0, 0, MFLG_SLOW,
+	"SCENE", 0, 0, 0, 0,
 	{mg_unreg, {m_scene, 3}, mg_ignore, mg_ignore, mg_ignore, {m_scene, 3}}
 };
 
 /* this serves as an alias for people who are used to inspircd/unreal m_roleplay */
 struct Message ambiance_msgtab = {
-	"AMBIANCE", 0, 0, 0, MFLG_SLOW,
+	"AMBIANCE", 0, 0, 0, 0,
 	{mg_unreg, {m_scene, 3}, mg_ignore, mg_ignore, mg_ignore, {m_scene, 3}}
 };
 
 struct Message fsay_msgtab = {
-	"FSAY", 0, 0, 0, MFLG_SLOW,
+	"FSAY", 0, 0, 0, 0,
 	{mg_unreg, {m_npc, 4}, mg_ignore, mg_ignore, mg_ignore, {m_fsay, 4}}
 };
 
 struct Message faction_msgtab = {
-	"FACTION", 0, 0, 0, MFLG_SLOW,
+	"FACTION", 0, 0, 0, 0,
 	{mg_unreg, {m_npca, 4}, mg_ignore, mg_ignore, mg_ignore, {m_faction, 4}}
 };
 
 struct Message npc_msgtab = {
-	"NPC", 0, 0, 0, MFLG_SLOW,
+	"NPC", 0, 0, 0, 0,
 	{mg_unreg, {m_npc, 4}, mg_ignore, mg_ignore, mg_ignore, {m_npc, 4}}
 };
 
 struct Message npca_msgtab = {
-	"NPCA", 0, 0, 0, MFLG_SLOW,
+	"NPCA", 0, 0, 0, 0,
 	{mg_unreg, {m_npca, 4}, mg_ignore, mg_ignore, mg_ignore, {m_npca, 4}}
 };
 
 struct Message roleplay_msgtab = {
-	"ROLEPLAY", 0, 0, 0, MFLG_SLOW,
+	"ROLEPLAY", 0, 0, 0, 0,
 	{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 };
 
-DECLARE_MODULE_AV1(roleplay, _modinit, _moddeinit, roleplay_clist, NULL, NULL, "$m_roleplay$");
+DECLARE_MODULE_AV2(roleplay, _modinit, _moddeinit, roleplay_clist, NULL, NULL, NULL, NULL, roleplay_desc);
 
-static int
-m_scene(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 0, 0, "=Scene=", parv[2]);
-	return 0;
+	m_displaymsg(msgbuf_p, source_p, parv[1], 0, 0, "=Scene=", parv[2]);
 }
 
-static int
-m_fsay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_fsay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 0, 0, parv[2], parv[3]);
-	return 0;
+	m_displaymsg(msgbuf_p, source_p, parv[1], 0, 0, parv[2], parv[3]);
 }
 
-static int
-m_faction(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_faction(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 0, 1, parv[2], parv[3]);
-	return 0;
+	m_displaymsg(msgbuf_p, source_p, parv[1], 0, 1, parv[2], parv[3]);
 }
 
-static int
-m_npc(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_npc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 1, 0, parv[2], parv[3]);
-	return 0;
+	m_displaymsg(msgbuf_p, source_p, parv[1], 1, 0, parv[2], parv[3]);
 }
 
-static int
-m_npca(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_npca(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	m_displaymsg(source_p, parv[1], 1, 1, parv[2], parv[3]);
-	return 0;
+	m_displaymsg(msgbuf_p, source_p, parv[1], 1, 1, parv[2], parv[3]);
 }
 
-static int
-m_displaymsg(struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text)
+static void
+m_displaymsg(struct MsgBuf *msgbuf_p, struct Client *source_p, const char *channel, int underline, int action, const char *nick, const char *text)
 {
 	struct Channel *chptr;
 	struct membership *msptr;
@@ -151,38 +149,38 @@ m_displaymsg(struct Client *source_p, const char *channel, int underline, int ac
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				form_str(ERR_NOSUCHCHANNEL), channel);
-		return 0;
+		return;
 	}
 
 	if(!(msptr = find_channel_membership(chptr, source_p)))
 	{
 		sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
 				   form_str(ERR_NOTONCHANNEL), chptr->chname);
-		return 0;
+		return;
 	}
 
 	if(!(chptr->mode.mode & chmode_flags['N']))
 	{
 		sendto_one_numeric(source_p, 573, "%s :Roleplay commands are not enabled on this channel.", chptr->chname);
-		return 0;
+		return;
 	}
 
 	if(!can_send(chptr, source_p, msptr))
 	{
 		sendto_one_numeric(source_p, 573, "%s :Cannot send to channel.", chptr->chname);
-		return 0;
+		return;
 	}
 
 	/* enforce flood stuff on roleplay commands */
 	if(flood_attack_channel(0, source_p, chptr, chptr->chname))
-		return 0;
+		return;
 
 	/* enforce target change on roleplay commands */
 	if(!is_chanop_voiced(msptr) && !IsOper(source_p) && !add_channel_target(source_p, chptr))
 	{
 		sendto_one(source_p, form_str(ERR_TARGCHANGE),
 			   me.name, source_p->name, chptr->chname);
-		return 0;
+		return;
 	}
 
 	if(underline)
@@ -195,7 +193,7 @@ m_displaymsg(struct Client *source_p, const char *channel, int underline, int ac
 	if(EmptyString(nick3))
 	{
 		sendto_one_numeric(source_p, 573, "%s :No visible non-stripped characters in nick.", chptr->chname);
-		return 0;
+		return;
 	}
 
 	snprintf(text3, sizeof(text3), "%s (%s)", text, source_p->name);
@@ -208,19 +206,17 @@ m_displaymsg(struct Client *source_p, const char *channel, int underline, int ac
 	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;
 }
 
-static int
-me_roleplay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_roleplay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr;
 
 	/* Don't segfault if we get ROLEPLAY with an invalid channel.
 	 * This shouldn't happen but it's best to be on the safe side. */
 	if((chptr = find_channel(parv[1])) == NULL)
-		return 0;
+		return;
 
 	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;
 }