None of the modules use an extern InspIRCd* any more

[user/henk/code/inspircd.git] / src / modules / m_sanick.cpp

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 7a78a15ce5e0dc01863e2ae8bedb2f5a95a86218..0d9167c26020cadd1bcd77d6b3af13d782943c5d 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -21,15 +21,17 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for SANICK command */
 
-static Server *Srv;
+
+
 
 class cmd_sanick : public command_t
 {
  public:
-       cmd_sanick () : command_t("SANICK", 'o', 2)
+ cmd_sanick (InspIRCd* Instance) : command_t(Instance,"SANICK", 'o', 2)
        {
                this->source = "m_sanick.so";
                syntax = "<nick> <new-nick>";
@@ -37,23 +39,23 @@ class cmd_sanick : public command_t
 
        void Handle (const char** parameters, int pcnt, userrec *user)
        {
-               userrec* source = Srv->FindNick(std::string(parameters[0]));
+               userrec* source = ServerInstance->FindNick(parameters[0]);
                if (source)
                {
-                       if (Srv->IsUlined(source->server))
+                       if (ServerInstance->IsUlined(source->server))
                        {
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
                                return;
                        }
-                       if (Srv->IsNick(std::string(parameters[1])))
+                       if (ServerInstance->IsNick(parameters[1]))
                        {
                                // FIX by brain: Cant use source->nick here because if it traverses a server link then
                                // source->nick becomes invalid as the object data moves in memory.
-                               Srv->SendOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                               ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
                                if (!source->ForceNickChange(parameters[1]))
                                {
                                        /* We couldnt change the nick */
-                                       userrec::QuitUser(source, "Nickname collision");
+                                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
                                        return;
                                }
                        }
@@ -66,12 +68,12 @@ class ModuleSanick : public Module
 {
        cmd_sanick*     mycommand;
  public:
-       ModuleSanick(Server* Me)
+       ModuleSanick(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_sanick();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_sanick(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSanick()
@@ -98,7 +100,7 @@ class ModuleSanickFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSanick(Me);
        }