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

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

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 3550d93013b449a74c37bf6d1eada5fbfc51bc73..db5a30f125ea9379d01b152af75f24ab4848e03c 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -22,13 +22,16 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
 
+extern InspIRCd* ServerInstance;
+
 class ChannelStripColor : public ModeHandler
 {
  public:
-       ChannelStripColor() : ModeHandler('S', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -60,7 +63,7 @@ class ChannelStripColor : public ModeHandler
 class UserStripColor : public ModeHandler
 {
  public:
-       UserStripColor() : ModeHandler('S', 0, 0, false, MODETYPE_USER, false) { }
+       UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -92,22 +95,22 @@ class UserStripColor : public ModeHandler
 
 class ModuleStripColor : public Module
 {
- Server *Srv;
+ 
  ConfigReader *Conf, *MyConf;
  ChannelStripColor *csc;
  UserStripColor *usc;
  
  public:
-       ModuleStripColor(Server* Me)
+       ModuleStripColor(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
+               
 
-               usc = new UserStripColor();
-               csc = new ChannelStripColor();
+               usc = new UserStripColor(ServerInstance);
+               csc = new ChannelStripColor(ServerInstance);
 
-               Srv->AddMode(usc, 'S');
-               Srv->AddMode(csc, 'S');
+               ServerInstance->AddMode(usc, 'S');
+               ServerInstance->AddMode(csc, 'S');
        }
 
        void Implements(char* List)
@@ -117,7 +120,7 @@ class ModuleStripColor : public Module
 
        virtual void On005Numeric(std::string &output)
        {
-               InsertMode(output,"S",4);
+               ServerInstance->ModeGrok->InsertMode(output,"S",4);
        }
        
        virtual ~ModuleStripColor()
@@ -227,7 +230,7 @@ class ModuleStripColorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleStripColor(Me);
        }