Changed behaviour of module API to pass Server* to the constructor, rather than have to create one (makes more sense)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2252 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 5 insertions, 7 deletions

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index ed01288a3..5bd453597 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -24,8 +24,6 @@ using namespace std;
 
 /* $ModDesc: Provides support for unreal-style oper-override */
 
-char dummyvalue[] = "on";
-
 class ModuleOverride : public Module
 {
 	Server *Srv;
@@ -34,13 +32,14 @@ class ModuleOverride : public Module
 	
  public:
  
-	ModuleOverride()
+	ModuleOverride(Server* Me)
+		: Module::Module(Me)
 	{
 	
 		// here we initialise our module. Use new to create new instances of the required
 		// classes.
 		
-		Srv = new Server;
+		Srv = Me;
 		Conf = new ConfigReader;
 		
 		// read our config options (main config file)
@@ -208,7 +207,6 @@ class ModuleOverride : public Module
 	virtual ~ModuleOverride()
 	{
 		delete Conf;
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
@@ -229,9 +227,9 @@ class ModuleOverrideFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleOverride;
+		return new ModuleOverride(Me);
 	}
 	
 };