mirror of
https://github.com/anope/anope.git
synced 2026-06-27 15:26:41 +02:00
Start making some stuff compile with the modified protocol signatures
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1369 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
+3
-3
@@ -1231,7 +1231,7 @@ class IRCDProto;
|
||||
|
||||
class IRCDProto {
|
||||
virtual void SendSVSKillInternal(const char *, const char *, const char *) = 0;
|
||||
virtual void SendModeInternal(const char *, const char *, const char *) = 0;
|
||||
virtual void SendModeInternal(BotInfo *, const char *, const char *) = 0;
|
||||
virtual void SendKickInternal(BotInfo *bi, const char *, const char *, const char *) = 0;
|
||||
virtual void SendNoticeChanopsInternal(BotInfo *bi, const char *, const char *) = 0;
|
||||
virtual void SendMessageInternal(BotInfo *bi, const char *dest, const char *buf)
|
||||
@@ -1288,14 +1288,14 @@ class IRCDProto {
|
||||
}
|
||||
virtual void SendSVSMode(User *, int, const char **) = 0;
|
||||
virtual void SendGuestNick(const char *, const char *, const char *, const char *, const char *) { }
|
||||
virtual void SendMode(const char *source, const char *dest, const char *fmt, ...)
|
||||
virtual void SendMode(BotInfo *bi, const char *dest, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
char buf[BUFSIZE] = "";
|
||||
va_start(args, fmt);
|
||||
vsnprintf(buf, BUFSIZE - 1, fmt, args);
|
||||
va_end(args);
|
||||
SendModeInternal(source, dest, buf);
|
||||
SendModeInternal(bi, dest, buf);
|
||||
}
|
||||
virtual void SendClientIntroduction(const char *, const char *, const char *, const char *, const char *) = 0;
|
||||
virtual void SendKick(BotInfo *bi, const char *chan, const char *user, const char *fmt, ...)
|
||||
|
||||
+1
-1
@@ -106,7 +106,7 @@ void sqline(char *mask, char *reason)
|
||||
av[0] = c->name;
|
||||
av[1] = cu->user->nick;
|
||||
av[2] = reason;
|
||||
ircdproto->SendKick(s_OperServ, av[0], av[1],
|
||||
ircdproto->SendKick(findbot(s_OperServ), av[0], av[1],
|
||||
"Q-Lined: %s", av[2]);
|
||||
do_kick(s_ChanServ, 3, av);
|
||||
}
|
||||
|
||||
+1
-1
@@ -108,7 +108,7 @@ void BotInfo::UnAssign(User *u, ChannelInfo *ci)
|
||||
send_event(EVENT_BOT_UNASSIGN, 2, ci->name, ci->bi->nick);
|
||||
|
||||
if (u && ci->c && ci->c->usercount >= BSMinUsers)
|
||||
ircdproto->SendPart(ci->bi->nick, ci->name, "UNASSIGN from %s", u->nick);
|
||||
ircdproto->SendPart(ci->bi, ci->name, "UNASSIGN from %s", u->nick);
|
||||
|
||||
ci->bi->chancount--;
|
||||
ci->bi = NULL;
|
||||
|
||||
+14
-14
@@ -750,7 +750,7 @@ void bot_join(ChannelInfo * ci)
|
||||
"%s invited %s into the channel.",
|
||||
ci->bi->nick, ci->bi->nick);
|
||||
}
|
||||
ircdproto->SendJoin(ci->bi->nick, ci->c->name, ci->c->creation_time);
|
||||
ircdproto->SendJoin(ci->bi, ci->c->name, ci->c->creation_time);
|
||||
ircdproto->SendBotOp(ci->bi->nick, ci->c->name);
|
||||
send_event(EVENT_BOT_JOIN, 2, ci->name, ci->bi->nick);
|
||||
}
|
||||
@@ -792,7 +792,7 @@ static void check_ban(ChannelInfo * ci, User * u, int ttbtype)
|
||||
ac = 3;
|
||||
}
|
||||
|
||||
ircdproto->SendMode(ci->bi->nick, ci->name, "+b %s", mask);
|
||||
ircdproto->SendMode(ci->bi, ci->name, "+b %s", mask);
|
||||
do_cmode(ci->bi->nick, ac, av);
|
||||
send_event(EVENT_BOT_BAN, 3, u->nick, ci->name, mask);
|
||||
}
|
||||
@@ -822,7 +822,7 @@ static void bot_kick(ChannelInfo * ci, User * u, int message, ...)
|
||||
av[0] = ci->name;
|
||||
av[1] = u->nick;
|
||||
av[2] = buf;
|
||||
ircdproto->SendKick(ci->bi->nick, av[0], av[1], "%s", av[2]);
|
||||
ircdproto->SendKick(ci->bi, av[0], av[1], "%s", av[2]);
|
||||
do_kick(ci->bi->nick, 3, av);
|
||||
send_event(EVENT_BOT_KICK, 3, u->nick, ci->name, buf);
|
||||
}
|
||||
@@ -846,7 +846,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
|
||||
|
||||
if (ircd->protectedumode) {
|
||||
if (is_protected(u) && (requester != u)) {
|
||||
ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s",
|
||||
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s",
|
||||
getstring2(NULL, PERMISSION_DENIED));
|
||||
return;
|
||||
}
|
||||
@@ -858,7 +858,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
|
||||
|
||||
if (ircd->except) {
|
||||
if (is_excepted(ci, u) == 1) {
|
||||
ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s",
|
||||
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s",
|
||||
getstring2(NULL, BOT_EXCEPT));
|
||||
return;
|
||||
}
|
||||
@@ -880,7 +880,7 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
|
||||
ac = 3;
|
||||
}
|
||||
|
||||
ircdproto->SendMode(ci->bi->nick, ci->name, "+b %s", mask);
|
||||
ircdproto->SendMode(ci->bi, ci->name, "+b %s", mask);
|
||||
do_cmode(ci->bi->nick, ac, av);
|
||||
|
||||
kav[0] = ci->name;
|
||||
@@ -898,10 +898,10 @@ void bot_raw_ban(User * requester, ChannelInfo * ci, char *nick,
|
||||
if ((ci->flags & CI_SIGNKICK)
|
||||
|| ((ci->flags & CI_SIGNKICK_LEVEL)
|
||||
&& !check_access(requester, ci, CA_SIGNKICK)))
|
||||
ircdproto->SendKick(ci->bi->nick, kav[0], kav[1], "%s (%s)", kav[2],
|
||||
ircdproto->SendKick(ci->bi, kav[0], kav[1], "%s (%s)", kav[2],
|
||||
requester->nick);
|
||||
else
|
||||
ircdproto->SendKick(ci->bi->nick, kav[0], kav[1], "%s", kav[2]);
|
||||
ircdproto->SendKick(ci->bi, kav[0], kav[1], "%s", kav[2]);
|
||||
|
||||
do_kick(ci->bi->nick, 3, kav);
|
||||
send_event(EVENT_BOT_KICK, 3, kav[1], kav[0], kav[2]);
|
||||
@@ -922,7 +922,7 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick,
|
||||
|
||||
if (ircd->protectedumode) {
|
||||
if (is_protected(u) && (requester != u)) {
|
||||
ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s",
|
||||
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s",
|
||||
getstring2(NULL, PERMISSION_DENIED));
|
||||
return;
|
||||
}
|
||||
@@ -946,10 +946,10 @@ void bot_raw_kick(User * requester, ChannelInfo * ci, char *nick,
|
||||
if ((ci->flags & CI_SIGNKICK)
|
||||
|| ((ci->flags & CI_SIGNKICK_LEVEL)
|
||||
&& !check_access(requester, ci, CA_SIGNKICK)))
|
||||
ircdproto->SendKick(ci->bi->nick, av[0], av[1], "%s (%s)", av[2],
|
||||
ircdproto->SendKick(ci->bi, av[0], av[1], "%s (%s)", av[2],
|
||||
requester->nick);
|
||||
else
|
||||
ircdproto->SendKick(ci->bi->nick, av[0], av[1], "%s", av[2]);
|
||||
ircdproto->SendKick(ci->bi, av[0], av[1], "%s", av[2]);
|
||||
do_kick(ci->bi->nick, 3, av);
|
||||
send_event(EVENT_BOT_KICK, 3, av[1], av[0], av[2]);
|
||||
}
|
||||
@@ -976,7 +976,7 @@ void bot_raw_mode(User * requester, ChannelInfo * ci, char *mode,
|
||||
|
||||
if (ircd->protectedumode) {
|
||||
if (is_protected(u) && *mode == '-' && (requester != u)) {
|
||||
ircdproto->SendPrivmsg(ci->bi->nick, ci->name, "%s",
|
||||
ircdproto->SendPrivmsg(ci->bi, ci->name, "%s",
|
||||
getstring2(NULL, PERMISSION_DENIED));
|
||||
return;
|
||||
}
|
||||
@@ -993,13 +993,13 @@ void bot_raw_mode(User * requester, ChannelInfo * ci, char *mode,
|
||||
av[2] = mode;
|
||||
av[3] = nick;
|
||||
ac = 4;
|
||||
ircdproto->SendMode(ci->bi->nick, av[0], "%s %s", av[2], av[3]);
|
||||
ircdproto->SendMode(ci->bi, av[0], "%s %s", av[2], av[3]);
|
||||
} else {
|
||||
av[0] = ci->name;
|
||||
av[1] = mode;
|
||||
av[2] = nick;
|
||||
ac = 3;
|
||||
ircdproto->SendMode(ci->bi->nick, av[0], "%s %s", av[1], av[2]);
|
||||
ircdproto->SendMode(ci->bi, av[0], "%s %s", av[1], av[2]);
|
||||
}
|
||||
|
||||
do_cmode(ci->bi->nick, ac, av);
|
||||
|
||||
Reference in New Issue
Block a user