Get rid of the OnRemoteKill hook, make use of GetRouting() and TR_CUSTOM to route...

[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 3cc01b4c05bcc842f98f121e41da040ec5b366fa..2c7207698cbaab65c0d8f80bc54c15bb0fc7f30a 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -42,19 +42,19 @@ class ModuleBlockColor : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(bc);
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+               Implementation eventlist[] = { I_OnUserPreMessage, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               ServerInstance->AddExtBanChar('c');
+               tokens["EXTBAN"].push_back('c');
        }
 
-       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
        {
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
@@ -86,16 +86,7 @@ class ModuleBlockColor : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-       }
-
-       virtual ~ModuleBlockColor()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides channel mode +c to block color",VF_VENDOR);
        }