Fix recommended by nenolod, silly mistake apparently :P

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

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index e7dd6e272eace3cbc85e184f95b5d44bc42561fa..638eda6b0e9f9da2ac10d59d5ee68237e7af764c 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -92,7 +92,7 @@ class MsgFlood : public ModeHandler
                return (their_param < our_param);
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                floodsettings *f;
 
@@ -140,8 +140,8 @@ class MsgFlood : public ModeHandler
                                        if (!channel->GetExt("flood", f))
                                        {
                                                parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
-                                               floodsettings *f = new floodsettings(ban,nsecs,nlines);
-                                               channel->Extend("flood",f);
+                                               floodsettings *fs = new floodsettings(ban,nsecs,nlines);
+                                               channel->Extend("flood",fs);
                                                channel->SetMode('f', true);
                                                channel->SetModeParam('f', parameter.c_str(), true);
                                                return MODEACTION_ALLOW;
@@ -160,9 +160,9 @@ class MsgFlood : public ModeHandler
                                                        if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
                                                        {
                                                                delete f;
-                                                               floodsettings *f = new floodsettings(ban,nsecs,nlines);
+                                                               floodsettings *fs = new floodsettings(ban,nsecs,nlines);
                                                                channel->Shrink("flood");
-                                                               channel->Extend("flood",f);
+                                                               channel->Extend("flood",fs);
                                                                channel->SetModeParam('f', cur_param.c_str(), false);
                                                                channel->SetModeParam('f', parameter.c_str(), true);
                                                                return MODEACTION_ALLOW;
@@ -186,7 +186,7 @@ class MsgFlood : public ModeHandler
                {
                        if (channel->GetExt("flood", f))
                        {
-                               DELETE(f);
+                               delete f;
                                channel->Shrink("flood");
                                channel->SetMode('f', false);
                                return MODEACTION_ALLOW;
@@ -209,8 +209,10 @@ class ModuleMsgFlood : public Module
        {
                
                mf = new MsgFlood(ServerInstance);
-               if (!ServerInstance->AddMode(mf, 'f'))
+               if (!ServerInstance->Modes->AddMode(mf))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNotice, I_OnUserPreMessage };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
        
        int ProcessMessages(User* user,Channel* dest, const std::string &text)
@@ -282,20 +284,16 @@ class ModuleMsgFlood : public Module
                floodsettings* f;
                if (chan->GetExt("flood", f))
                {
-                       DELETE(f);
+                       delete f;
                        chan->Shrink("flood");
                }
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnChannelDelete] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
-       }
 
        virtual ~ModuleMsgFlood()
        {
                ServerInstance->Modes->DelMode(mf);
-               DELETE(mf);
+               delete mf;
        }
        
        virtual Version GetVersion()