Argh, i give up

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

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 0096c1719dfd316c5e8ee8b05dc30e021f7a9d7a..8d4386dd1bdd61f55303cb52bdefa4ebcf230b8c 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -55,7 +55,7 @@ class KickRejoin : public ModeHandler
                        
                        if (channel->GetExt("norejoinusers", dl))
                        {
-                               DELETE(dl);
+                               delete dl;
                                channel->Shrink("norejoinusers");
                        }
                        
@@ -124,8 +124,10 @@ public:
        {
                
                kr = new KickRejoin(ServerInstance);
-               if (!ServerInstance->AddMode(kr, 'J'))
+               if (!ServerInstance->AddMode(kr))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
        virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
@@ -160,7 +162,7 @@ public:
                                if (!dl->size())
                                {
                                        // Now it's empty..
-                                       DELETE(dl);
+                                       delete dl;
                                        chan->Shrink("norejoinusers");
                                }
                        }
@@ -188,7 +190,7 @@ public:
                        
                if (chan->GetExt("norejoinusers", dl))
                {
-                       DELETE(dl);
+                       delete dl;
                        chan->Shrink("norejoinusers");
                }
        }
@@ -199,15 +201,11 @@ public:
                        OnChannelDelete((Channel*)item);
        }
 
-       virtual void Implements(char* List)
-       {
-               List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
-       }
 
        virtual ~ModuleKickNoRejoin()
        {
                ServerInstance->Modes->DelMode(kr);
-               DELETE(kr);
+               delete kr;
        }
        
        virtual Version GetVersion()