diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/bs_bot.c | 10 | ||||
| -rw-r--r-- | src/init.c | 20 | ||||
| -rw-r--r-- | src/ircd.c | 5 |
3 files changed, 15 insertions, 20 deletions
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 09e9b3860..d15f00dc5 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -6,8 +6,8 @@ * Please read COPYING and README for further details. * * Based on the original code of Epona by Lara. - * Based on the original code of Services by Andy Church. - * + * Based on the original code of Services by Andy Church. + * * $Id$ * */ @@ -164,7 +164,7 @@ int do_bot(User * u) EnforceQlinedNick(nick, s_BotServ); /* We make the bot online, ready to serve */ - anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, + ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode); notice_lang(s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user, @@ -292,14 +292,14 @@ int do_bot(User * u) /* If only the nick changes, we just make the bot change his nick, else we must make it quit and rejoin. We must not forget to set - the Q:Line either (it's otherwise set in anope_SendClientIntroduction) */ + the Q:Line either (it's otherwise set in SendClientIntroduction) */ if (!user) { anope_SendChangeBotNick(oldnick, bi->nick); anope_SendSQLine(bi->nick, "Reserved for services"); } else { anope_SendQuit(oldnick, "Quit: Be right back"); - anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, + ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode); bi->RejoinAll(); } diff --git a/src/init.c b/src/init.c index 01ebf6c1e..83e0f4b25 100644 --- a/src/init.c +++ b/src/init.c @@ -34,39 +34,39 @@ void introduce_user(const char *user) #undef LTSIZE /* We make aliases go online */ if (s_NickServAlias && (!user || stricmp(user, s_NickServAlias) == 0)) { - anope_SendClientIntroduction(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode); + ircdproto->SendClientIntroduction(s_NickServAlias, ServiceUser, ServiceHost, desc_NickServAlias, ircd->nickservaliasmode); } if (s_ChanServAlias && (!user || stricmp(user, s_ChanServAlias) == 0)) { - anope_SendClientIntroduction(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode); + ircdproto->SendClientIntroduction(s_ChanServAlias, ServiceUser, ServiceHost, desc_ChanServAlias, ircd->chanservaliasmode); } if (s_MemoServAlias && (!user || stricmp(user, s_MemoServAlias) == 0)) { - anope_SendClientIntroduction(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode); + ircdproto->SendClientIntroduction(s_MemoServAlias, ServiceUser, ServiceHost, desc_MemoServAlias, ircd->memoservaliasmode); } if (s_BotServAlias && (!user || stricmp(user, s_BotServAlias) == 0)) { - anope_SendClientIntroduction(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode); + ircdproto->SendClientIntroduction(s_BotServAlias, ServiceUser, ServiceHost, desc_BotServAlias, ircd->botservaliasmode); } if (s_HelpServAlias && (!user || stricmp(user, s_HelpServAlias) == 0)) { - anope_SendClientIntroduction(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode); + ircdproto->SendClientIntroduction(s_HelpServAlias, ServiceUser, ServiceHost, desc_HelpServAlias, ircd->helpservaliasmode); } if (s_OperServAlias && (!user || stricmp(user, s_OperServAlias) == 0)) { - anope_SendClientIntroduction(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode); + ircdproto->SendClientIntroduction(s_OperServAlias, ServiceUser, ServiceHost, desc_OperServAlias, ircd->operservaliasmode); } if (s_DevNullAlias && (!user || stricmp(user, s_DevNullAlias) == 0)) { - anope_SendClientIntroduction(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode); + ircdproto->SendClientIntroduction(s_DevNullAlias, ServiceUser, ServiceHost, desc_DevNullAlias, ircd->devnullvaliasmode); } if (s_HostServAlias && ircd->vhost && (!user || stricmp(user, s_HostServAlias) == 0)) { - anope_SendClientIntroduction(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode); + ircdproto->SendClientIntroduction(s_HostServAlias, ServiceUser, ServiceHost, desc_HostServAlias, ircd->hostservaliasmode); } if (s_GlobalNoticerAlias && (!user || stricmp(user, s_GlobalNoticerAlias) == 0)) { - anope_SendClientIntroduction(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode); + ircdproto->SendClientIntroduction(s_GlobalNoticerAlias, ServiceUser, ServiceHost, desc_GlobalNoticerAlias, ircd->globalaliasmode); } /* We make the bots go online */ @@ -79,7 +79,7 @@ void introduce_user(const char *user) for (bi = botlists[i]; bi; bi = bi->next) { if (!user || !stricmp(user, bi->nick)) - anope_SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode); + ircdproto->SendClientIntroduction(bi->nick, bi->user, bi->host, bi->real, ircd->botserv_bot_mode); } } } diff --git a/src/ircd.c b/src/ircd.c index 85e55f9fc..30ffcfd3c 100644 --- a/src/ircd.c +++ b/src/ircd.c @@ -43,11 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av) ircdproto->ProcessUsermodes(user, ac, av); } -void anope_SendClientIntroduction(const char *nick, const char *user, const char *host, const char *real, const char *modes) -{ - ircdproto->SendClientIntroduction(nick, user, host, real, modes); -} - void anope_SendKick(const char *source, const char *chan, const char *user, const char *fmt, ...) { va_list args; |