From a9fd3fd828ab7b717cb7676f3a9e881b02a05743 Mon Sep 17 00:00:00 2001
From: "Robin Burchell w00t@inspircd.org"
 <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Sun, 9 Nov 2008 00:27:24 +0000
Subject: Merge modules_init() with modules_core_init().

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1604 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/init.c    |  2 +-
 src/modules.c | 32 +-------------------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/init.c b/src/init.c
index 47e7cf51c..fea6f0aa0 100644
--- a/src/init.c
+++ b/src/init.c
@@ -529,7 +529,7 @@ int init_secondary(int ac, char **av)
     helpserv_init();
 
     /* load any custom modules */
-    modules_init();
+	modules_core_init(ModulesNumber, ModulesAutoload);
 
     /* Initialize random number generator */
     rand_init();
diff --git a/src/modules.c b/src/modules.c
index e1794d3f9..bb7bc8668 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -171,38 +171,8 @@ static int displayMessageFromHash(const char *name)
 
 /************************************************/
 
-
-
-
-
-
-/**
- * Automaticaly load modules at startup.
- * This will load modules at startup before the IRCD link is attempted, this
- * allows admins to have a module relating to ircd support load
- */
-void modules_init(void)
-{
-    int idx;
-	int ret;
-    Module *m;
-
-    if(nothird) {
-        return;
-    }
-
-    for (idx = 0; idx < ModulesNumber; idx++) {
-        m = findModule(ModulesAutoload[idx]);
-        if (!m) {
-			ret = loadModule(ModulesAutoload[idx], NULL);
-            mod_current_module = NULL;
-            mod_current_user = NULL;
-        }
-    }
-}
-
 /**
- * Load up a list of core modules from the conf.
+ * Load up a list of modules.
  * @param number The number of modules to load
  * @param list The list of modules to load
  **/
-- 
cgit