X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=7cc0504038630ad9d22d94e1ae6e9932ecad152a;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=a6cad9577c3b8328cf0a6ff03cf5f1406f4ebf21;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index a6cad9577..7cc050403 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.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,43 +12,15 @@
  */
 
 #include "inspircd.h"
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
 
 /** Handles user mode +B
  */
-class BotMode : public ModeHandler
+class BotMode : public SimpleUserModeHandler
 {
  public:
-	BotMode(InspIRCd* Instance) : ModeHandler(Instance, 'B', 0, 0, false, MODETYPE_USER, false) { }
-
-	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-	{
-		if (adding)
-		{
-			if (!dest->IsModeSet('B'))
-			{
-				dest->SetMode('B',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (dest->IsModeSet('B'))
-			{
-				dest->SetMode('B',false);
-				return MODEACTION_ALLOW;
-			}
-		}
-		
-		return MODEACTION_DENY;
-	}
+	BotMode(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'B') { }
 };
 
 class ModuleBotMode : public Module
@@ -61,27 +33,25 @@ class ModuleBotMode : public Module
 	{
 		
 		bm = new BotMode(ServerInstance);
-		if (!ServerInstance->AddMode(bm, 'B'))
+		if (!ServerInstance->Modes->AddMode(bm))
 			throw ModuleException("Could not add new modes!");
+		Implementation eventlist[] = { I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnWhois] = 1;
-	}
 	
 	virtual ~ModuleBotMode()
 	{
 		ServerInstance->Modes->DelMode(bm);
-		DELETE(bm);
+		delete bm;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnWhois(userrec* src, userrec* dst)
+	virtual void OnWhois(User* src, User* dst)
 	{
 		if (dst->IsModeSet('B'))
 		{