Replaced anope_cmd_notice() with direct call to SendNotice() in IRCDProto class.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1334 5417fbe8-f217-4b02-8779-1006273d7864

4 files changed, 6 insertions, 13 deletions

diff --git a/include/extern.h b/include/extern.h
index 200baa430..c7993688a 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -1129,7 +1129,6 @@ E void anope_SendBanDel(const char *name, const char *nick);				  		  			      /
 E void anope_SendBotOp(const char *nick, const char *chan);			  		  /* MODE BotServ */
 E void anope_cmd_netinfo(int ac, const char **av);						  /* NETINFO */
 E void anope_SendChangeBotNick(const char *oldnick, const char *newnick);             	  		  /* NICK */
-E void anope_cmd_notice(const char *source, const char *dest, const char *msg);		  		  /* NOTICE */
 E void anope_SendGlobalNotice(const char *source, const char *dest, const char *msg);		  		  /* NOTICE */
 E void anope_SendPart(const char *nick, const char *chan, const char *fmt, ...); 	  		  /* PART */
 E void anope_cmd_pass(const char *pass);                                   	  		  /* PASS */
diff --git a/src/ircd.c b/src/ircd.c
index 999bbf515..5a75668ee 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -56,12 +56,6 @@ void anope_cmd_message(const char *source, const char *dest, const char *fmt, ..
 	ircdproto->SendMessage(bi, dest, buf);
 }
 
-void anope_cmd_notice(const char *source, const char *dest, const char *msg)
-{
-	BotInfo *bi = findbot(source);
-	ircdproto->SendNotice(bi, dest, msg);
-}
-
 void anope_cmd_action(const char *source, const char *dest, const char *fmt, ...)
 {
 	va_list args;
diff --git a/src/send.c b/src/send.c
index d99b08dab..5911dda44 100644
--- a/src/send.c
+++ b/src/send.c
@@ -153,9 +153,9 @@ void notice_list(char *source, char *dest, char **text)
          * with a single space.
          */
         if (**text) {
-            anope_cmd_notice(source, dest, *text);
+            ircdproto->SendNotice(source, dest, *text);
         } else {
-            anope_cmd_notice(source, dest, " ");
+            ircdproto->SendNotice(source, dest, " ");
         }
         text++;
     }
@@ -204,7 +204,7 @@ void notice_lang(const char *source, User * dest, int message, ...)
                                && (dest->na->nc->flags & NI_MSG)))) {
             anope_cmd_privmsg(source, dest->nick, *t ? t : " ");
         } else {
-            anope_cmd_notice(source, dest->nick, *t ? t : " ");
+            ircdproto->SendNotice(source, dest->nick, *t ? t : " ");
         }
     }
     va_end(args);
@@ -260,7 +260,7 @@ void notice_help(const char *source, User * dest, int message, ...)
                                && (dest->na->nc->flags & NI_MSG)))) {
             anope_cmd_privmsg(source, dest->nick, *outbuf ? outbuf : " ");
         } else {
-            anope_cmd_notice(source, dest->nick, *outbuf ? outbuf : " ");
+            ircdproto->SendNotice(source, dest->nick, *outbuf ? outbuf : " ");
         }
     }
     va_end(args);
@@ -289,7 +289,7 @@ void notice(char *source, const char *dest, const char *fmt, ...)
         if (NSDefFlags & NI_MSG) {
             anope_cmd_privmsg(source, dest, buf);
         } else {
-            anope_cmd_notice(source, dest, buf);
+            ircdproto->SendNotice(source, dest, buf);
         }
         va_end(args);
     }
diff --git a/src/users.c b/src/users.c
index 16d9528e4..dee3f645c 100644
--- a/src/users.c
+++ b/src/users.c
@@ -301,7 +301,7 @@ void User::SendMessage(const char *source, const std::string &msg)
 	}
 	else
 	{
-		anope_cmd_notice(source, this->nick, msg.c_str());
+		ircdproto->SendNotice(source, this->nick, msg.c_str());
 	}
 }