None of the modules use an extern InspIRCd* any more

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

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index ce956b9e0a61d5a0143f2e31642814ed153a1a1a..afc3cfa02259c160f1e1b3fbd915d0a43533f301 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -27,13 +27,12 @@ using namespace std;
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
 
 class cmd_knock : public command_t
 {
  public:
-       cmd_knock () : command_t("KNOCK", 0, 2)
+ cmd_knock (InspIRCd* Instance) : command_t(Instance,"KNOCK", 0, 2)
        {
                this->source = "m_knock.so";
                syntax = "<channel> <reason>";
@@ -80,7 +79,7 @@ class cmd_knock : public command_t
 class Knock : public ModeHandler
 {
  public:
-       Knock() : ModeHandler('K', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -110,13 +109,13 @@ class ModuleKnock : public Module
        cmd_knock* mycommand;
        Knock* kn;
  public:
-       ModuleKnock(Server* Me) : Module::Module(Me)
+       ModuleKnock(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               kn = new Knock();
-               Srv->AddMode(kn, 'K');
-               mycommand = new cmd_knock();
-               Srv->AddCommand(mycommand);
+               
+               kn = new Knock(ServerInstance);
+               ServerInstance->AddMode(kn, 'K');
+               mycommand = new cmd_knock(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
 
        void Implements(char* List)
@@ -153,7 +152,7 @@ class ModuleKnockFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleKnock(Me);
        }