(Bigger than it looks, i did this with perl inplace edit) -- commands now take an...

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index f517ba215d2564ec07a16c0379071c45a2c515f4..92919d15360489128e1e057f538ea36b397a0b38 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -22,13 +22,16 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
+extern InspIRCd* ServerInstance;
+
 class BlockColor : public ModeHandler
 {
  public:
-       BlockColor() : ModeHandler('c', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -55,15 +58,15 @@ class BlockColor : public ModeHandler
 
 class ModuleBlockColour : public Module
 {
-       Server *Srv;
+       
        BlockColor *bc;
  public:
  
-       ModuleBlockColour(Server* Me) : Module::Module(Me)
+       ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               bc = new BlockColor();
-               Srv->AddMode(bc, 'c');
+               
+               bc = new BlockColor(ServerInstance);
+               ServerInstance->AddMode(bc, 'c');
        }
 
        void Implements(char* List)
@@ -73,7 +76,7 @@ class ModuleBlockColour : public Module
 
        virtual void On005Numeric(std::string &output)
        {
-               InsertMode(output,"c",4);
+               ServerInstance->ModeGrok->InsertMode(output,"c",4);
        }
        
        virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
@@ -95,7 +98,7 @@ class ModuleBlockColour : public Module
                                                case 21:
                                                case 22:
                                                case 31:
-                                                       WriteServ(user->fd,"404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
+                                                       user->WriteServ("404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
                                                        return 1;
                                                break;
                                        }
@@ -112,6 +115,7 @@ class ModuleBlockColour : public Module
 
        virtual ~ModuleBlockColour()
        {
+               DELETE(bc);
        }
        
        virtual Version GetVersion()
@@ -132,7 +136,7 @@ class ModuleBlockColourFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleBlockColour(Me);
        }