Remove next_call garbage.. It didn't really do much more than obfuscate things. InspI...

[user/henk/code/inspircd.git] / src / cmd_modules.cpp

diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index be236fcd92dec16ffbb6b6a6e315befe829339d1..fd86254e560278c695c4b75746d274a6c46982e9 100644 (file)
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
 #include "commands/cmd_modules.h"
 
@@ -34,18 +31,18 @@ char* itab[] = {
        "OnPostCommand", "OnPostJoin", "OnWhoisLine", "OnBuildExemptList", "OnRawSocketConnect", "OnGarbageCollect", NULL
 };
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
        return new cmd_modules(Instance);
 }
 
 /** Handle /MODULES
  */
-CmdResult cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_modules::Handle (const char** parameters, int pcnt, User *user)
 {
        for (unsigned int i = 0; i < ServerInstance->Config->module_names.size(); i++)
        {
-               Version V = ServerInstance->modules[i]->GetVersion();
+               Version V = ServerInstance->Modules->modules[i]->GetVersion();
                char modulename[MAXBUF];
                char flagstate[MAXBUF];
                *flagstate = 0;
@@ -62,7 +59,7 @@ CmdResult cmd_modules::Handle (const char** parameters, int pcnt, userrec *user)
                strlcpy(modulename,ServerInstance->Config->module_names[i].c_str(),256);
                if (IS_OPER(user))
                {
-                       user->WriteServ("900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,ServerInstance->modules[i],V.Major,V.Minor,V.Revision,V.Build,ServerConfig::CleanFilename(modulename),flagstate+2);
+                       user->WriteServ("900 %s :0x%08lx %d.%d.%d.%d %s (%s)",user->nick,ServerInstance->Modules->modules[i],V.Major,V.Minor,V.Revision,V.Build,ServerConfig::CleanFilename(modulename),flagstate+2);
                }
                else
                {