X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operlevels.cpp;h=334bdfd7a42f6ae953029f5e439896d5dd6f0d05;hb=53afaa7cadcdf222dcf761441727305f79b4c557;hp=1291b28de9d7c4eb09254861e25d248acc3b0cbb;hpb=7380557b160e6600f5a444d81a237008cc7fbea5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 1291b28de..334bdfd7a 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
-
 #include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
@@ -33,26 +28,24 @@ class ModuleOperLevels : public Module
 	public:
 
 		ModuleOperLevels(InspIRCd* Me)
-			: Module::Module(Me)
+			: Module(Me)
 		{
 
 			
 			conf = new ConfigReader(ServerInstance);
+		Implementation eventlist[] = { I_OnRehash, I_OnKill };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 		}
 
 		virtual ~ModuleOperLevels()
 		{
-			DELETE(conf);
+			delete conf;
 		}
 
-		void Implements(char* List)
-		{
-			List[I_OnRehash] = List[I_OnKill] = 1;
-		}
 
-		virtual void OnRehash(userrec* user, const std::string &parameter)
+		virtual void OnRehash(User* user, const std::string &parameter)
 		{
-			DELETE(conf);
+			delete conf;
 			conf = new ConfigReader(ServerInstance);
 		}
 
@@ -61,7 +54,7 @@ class ModuleOperLevels : public Module
 			return Version(1,1,0,1,VF_VENDOR,API_VERSION);
 		}
 
-		virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
+		virtual int OnKill(User* source, User* dest, const std::string &reason)
 		{
 			long dest_level = 0,source_level = 0;
 
@@ -90,7 +83,7 @@ class ModuleOperLevels : public Module
 				{
 					ServerInstance->WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str());
 					dest->WriteServ("NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick);
-					source->WriteServ("481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
+					source->WriteServ("481 %s :Permission Denied - Oper %s is a higher level than you",source->nick,dest->nick);
 					return 1;
 				}
 			}
@@ -99,26 +92,5 @@ class ModuleOperLevels : public Module
 
 };
 
-class ModuleOperLevelsFactory : public ModuleFactory
-{
- public:
-	ModuleOperLevelsFactory()
-	{
-	}
-
-	~ModuleOperLevelsFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperLevels(Me);
-	}
-
-};
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperLevelsFactory;
-}
+MODULE_INIT(ModuleOperLevels)