X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockcolor.cpp;h=f62e546136485ee142ec6d4061ee90af01d0f28f;hb=5a88424dbb33ac825aa0b9b6525179329ee75519;hp=2b90065837ecc5a75c4c4d421f181dab2c96b10f;hpb=09afa5085614e0224a296abd082fce205003c3fe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 2b9006583..f62e54613 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -21,15 +21,16 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
+/** Handles the +c channel mode
+ */
 class BlockColor : public ModeHandler
 {
  public:
-	BlockColor() : ModeHandler('c', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -56,28 +57,23 @@ class BlockColor : public ModeHandler
 
 class ModuleBlockColour : public Module
 {
-	Server *Srv;
+	
 	BlockColor *bc;
  public:
  
-	ModuleBlockColour(Server* Me) : Module::Module(Me)
+	ModuleBlockColour(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		bc = new BlockColor();
-		Srv->AddMode(bc, 'c');
+		
+		bc = new BlockColor(ServerInstance);
+		ServerInstance->AddMode(bc, 'c');
 	}
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output,"c",4);
-	}
-	
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
@@ -106,19 +102,20 @@ class ModuleBlockColour : public Module
 		return 0;
 	}
 	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
-		return OnUserPreMessage(user,dest,target_type,text,status);
+		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 
 	virtual ~ModuleBlockColour()
 	{
+		ServerInstance->Modes->DelMode(bc);
 		DELETE(bc);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
@@ -134,7 +131,7 @@ class ModuleBlockColourFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleBlockColour(Me);
 	}