From d02a5866d4fdedec9219aeca0a6048828b394fd2 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 10 Aug 2006 21:19:19 +0000 Subject: Mass-tidyup of module global vars, theyre no longer global vars. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4856 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/modules/m_spanningtree.cpp') diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index cd13e5bfd..d9e18ef80 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -71,10 +71,6 @@ static ModuleSpanningTree* TreeProtocolModule; extern InspIRCd* ServerInstance; -extern std::vector modules; -extern std::vector factory; -extern int MODCOUNT; - /* Any socket can have one of five states at any one time. * The LISTENER state indicates a socket which is listening * for connections. It cannot receive data itself, only incoming @@ -820,9 +816,9 @@ class TreeSocket : public InspSocket std::vector modlist; std::string capabilities = ""; - for (int i = 0; i <= MODCOUNT; i++) + for (int i = 0; i <= ServerInstance->GetModuleCount(); i++) { - if ((modules[i]->GetVersion().Flags & VF_STATIC) || (modules[i]->GetVersion().Flags & VF_COMMON)) + if ((ServerInstance->modules[i]->GetVersion().Flags & VF_STATIC) || (ServerInstance->modules[i]->GetVersion().Flags & VF_COMMON)) modlist.push_back(ServerInstance->Config->module_names[i]); } sort(modlist.begin(),modlist.end()); -- cgit v1.2.3