Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 0f402a1edd66ad2d887819ede6a41cf52d27b181..0cde92bece980792a84354ae7c1ea365541dd77a 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -21,18 +21,18 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
-extern InspIRCd* ServerInstance;
+
 
 class BotMode : public ModeHandler
 {
  public:
-       BotMode() : ModeHandler('B', 0, 0, false, MODETYPE_USER, false) { }
+       BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -63,15 +63,15 @@ class BotMode : public ModeHandler
 
 class ModuleBotMode : public Module
 {
-       Server *Srv;
+       
        BotMode* bm;
  public:
-       ModuleBotMode(Server* Me)
+       ModuleBotMode(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               bm = new BotMode();
-               Srv->AddMode(bm, 'B');
+               
+               bm = new BotMode(ServerInstance);
+               ServerInstance->AddMode(bm, 'B');
        }
 
        void Implements(char* List)
@@ -112,7 +112,7 @@ class ModuleBotModeFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleBotMode(Me);
        }