BUILD : 1.7.8 (753) BUGS : N/a NOTES : Merged anope-dev with trunk

git-svn-id: svn://svn.anope.org/anope/trunk@753 31f1291d-b8d6-0310-a050-a5561fc1590b


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

1 files changed, 1 insertions, 32 deletions

diff --git a/src/helpserv.c b/src/helpserv.c
index 7b69996e1..f1e4bff35 100644
--- a/src/helpserv.c
+++ b/src/helpserv.c
@@ -16,7 +16,6 @@
 #include "services.h"
 #include "pseudo.h"
 
-static int do_help(User * u);
 void moduleAddHelpServCmds(void);
 
 /*************************************************************************/
@@ -27,9 +26,7 @@ void moduleAddHelpServCmds(void);
  */
 void moduleAddHelpServCmds(void)
 {
-    Command *c;
-    c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1);
-    addCoreCommand(HELPSERV, c);
+    modules_core_init(HelpServCoreNumber, HelpServCoreModules);
 }
 
 /*************************************************************************/
@@ -70,31 +67,3 @@ void helpserv(User * u, char *buf)
 }
 
 /*************************************************************************/
-
-/**
- * Display the HelpServ help.
- * This core function has been embed in the source for a long time, but  
- * it moved into it's own file so we now all can enjoy the joy of        
- * modules for HelpServ.
- * @param u User Struct of the user looking for help
- * @return MOD_CONT
- */
-static int do_help(User * u)
-{
-    char *cmd = strtok(NULL, "");
-
-    if (!cmd) {
-        notice_help(s_HelpServ, u, HELP_HELP, s_NickServ, s_ChanServ,
-                    s_MemoServ);
-        if (s_BotServ) {
-            notice_help(s_HelpServ, u, HELP_HELP_BOT, s_BotServ);
-        }
-        if (s_HostServ) {
-            notice_help(s_HelpServ, u, HELP_HELP_HOST, s_HostServ);
-        }
-        moduleDisplayHelp(7, u);
-    } else {
-        mod_help_cmd(s_HelpServ, u, HELPSERV, cmd);
-    }
-    return MOD_CONT;
-}