X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_nonotice.cpp;h=11b57e09be9d2530f320750f0231dfb3c4b89b61;hb=ece985ccb3210a132d67381511642edfb359f5c4;hp=ae926b4bbb5d1ec7b93fe4ef224e98cc8ba4ec48;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index ae926b4bb..11b57e09b 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.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
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
@@ -23,7 +20,7 @@ class NoNotice : public ModeHandler
  public:
 	NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -57,20 +54,18 @@ class ModuleNoNotice : public Module
 	{
 		
 		nt = new NoNotice(ServerInstance);
-		if (!ServerInstance->AddMode(nt, 'T'))
+		if (!ServerInstance->Modes->AddMode(nt))
 			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnUserPreNotice };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreNotice] = 1;
-	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
 		{
-			chanrec* c = (chanrec*)dest;
+			Channel* c = (Channel*)dest;
 			if (c->IsModeSet('T'))
 			{
 				if ((ServerInstance->ULine(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
@@ -91,7 +86,7 @@ class ModuleNoNotice : public Module
 	virtual ~ModuleNoNotice()
 	{
 		ServerInstance->Modes->DelMode(nt);
-		DELETE(nt);
+		delete nt;
 	}
 	
 	virtual Version GetVersion()