X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=18a594c31bcf94b50c8a6ec495dc838c468abe09;hb=192ae99685903cfb71bbf70edc450c4a6314621e;hp=a4cebc4c79dcb8354fc7e469c88ba086ad016c99;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index a4cebc4c7..18a594c31 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -11,12 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style umode +B */
@@ -28,7 +22,7 @@ class BotMode : public ModeHandler
  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)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		if (adding)
 		{
@@ -61,7 +55,7 @@ class ModuleBotMode : public Module
 	{
 		
 		bm = new BotMode(ServerInstance);
-		if (!ServerInstance->AddMode(bm, 'B'))
+		if (!ServerInstance->AddMode(bm))
 			throw ModuleException("Could not add new modes!");
 	}
 
@@ -81,7 +75,7 @@ class ModuleBotMode : public Module
 		return Version(1,1,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'))
 		{
@@ -91,28 +85,5 @@ class ModuleBotMode : public Module
 
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleBotModeFactory : public ModuleFactory
-{
- public:
-	ModuleBotModeFactory()
-	{
-	}
-	
-	~ModuleBotModeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBotMode(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleBotModeFactory;
-}
+MODULE_INIT(ModuleBotMode)