X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=4a4ea68d09558ac44ebdb4d56f3024b0361c3ffa;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=5871b92278d11f8793625af90c30977279e04ffc;hpb=c93af7582aed5f62e484550330697c634ba95f8b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 5871b9227..4a4ea68d0 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides user mode +B to mark the user as a bot */
-
 /** Handles user mode +B
  */
 class BotMode : public SimpleUserModeHandler
@@ -38,31 +36,27 @@ class ModuleBotMode : public Module
 	ModuleBotMode()
 		: bm(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&bm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-
-	virtual ~ModuleBotMode()
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->Modules->AddService(bm);
+		Implementation eventlist[] = { I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR);
 	}
 
-	virtual void OnWhois(User* src, User* dst)
+	void OnWhois(User* src, User* dst) CXX11_OVERRIDE
 	{
-		if (dst->IsModeSet('B'))
+		if (dst->IsModeSet(bm))
 		{
-			ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a bot on "+ServerInstance->Config->Network);
+			ServerInstance->SendWhoisLine(src, dst, 335, src->nick+" "+dst->nick+" :is a bot on "+ServerInstance->Config->Network);
 		}
 	}
-
 };
 
-
 MODULE_INIT(ModuleBotMode)