All modules which implement simplemodes (no parameters, not a list mode) can now...

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

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 63e2a1f36288c73d5aa8662bb75cb2461b1fa2d2..2453308d3a21b140626749a59f30d17c8fc89cad 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -37,13 +37,13 @@ using namespace std;
 #include "modules.h"
 #include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
         
 class cmd_samode : public command_t
 {
  public:
-       cmd_samode () : command_t("SAMODE", 'o', 2)
+ cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
        {
                this->source = "m_samode.so";
                syntax = "<target> <modes> {<mode-parameters>}";
@@ -55,12 +55,12 @@ class cmd_samode : public command_t
                 * Handles an SAMODE request. Notifies all +s users.
                 */
                std::string result;
-               log(DEBUG,"SAMODE: Being handled");
+               ServerInstance->Log(DEBUG,"SAMODE: Being handled");
                userrec* n = new userrec(ServerInstance);
-               n->fd = FD_MAGIC_NUMBER;
-               Srv->SendMode(parameters,pcnt,n);
+               n->SetFd(FD_MAGIC_NUMBER);
+               ServerInstance->SendMode(parameters,pcnt,n);
                delete n;
-               log(DEBUG,"SAMODE: Modechange handled");
+               ServerInstance->Log(DEBUG,"SAMODE: Modechange handled");
                result = std::string(user->nick);
                result.append(" used SAMODE");
                for (int n = 0; n < pcnt; n++)
@@ -80,8 +80,8 @@ class ModuleSaMode : public Module
                : Module::Module(Me)
        {
                
-               mycommand = new cmd_samode();
-               Srv->AddCommand(mycommand);
+               mycommand = new cmd_samode(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleSaMode()