From e1efa862f373aacefa027f346c0976f802818727 Mon Sep 17 00:00:00 2001 From: brain Date: Sun, 4 Nov 2007 19:28:22 +0000 Subject: Not yet tested: remove last vestiges of modules[] and module_names[] arrays. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8514 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/inspircd.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/inspircd.cpp') diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 1f46fa875..e5e9ad5b3 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -103,11 +103,13 @@ void InspIRCd::Cleanup() if (MyModCount) { /* Unload all modules, so they get a chance to clean up their listeners */ - for (int j = 0; j <= MyModCount; j++) + /*XXX FIXME + * for (int j = 0; j <= MyModCount; j++) mymodnames.push_back(Config->module_names[j]); for (int k = 0; k <= MyModCount; k++) this->Modules->Unload(mymodnames[k].c_str()); + */ } } @@ -715,18 +717,13 @@ int main(int argc, char ** argv) */ bool InspIRCd::AllModulesReportReady(User* user) { - if (!Config->global_implementation[I_OnCheckReady]) - return true; - - for (int i = 0; i <= this->Modules->GetCount(); i++) + for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i) { - if (Config->implement_lists[i][I_OnCheckReady]) - { - int res = this->Modules->modules[i]->OnCheckReady(user); - if (!res) - return false; - } + int res = (*i)->OnCheckReady(user); + if (!res) + return false; } + return true; } -- cgit v1.2.3