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, 6 insertions, 7 deletions

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 2c4a44925..a2a3c0312 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -17,14 +17,13 @@ void do_opermotd(char** parameters, int pcnt, userrec* user);
 
 void LoadOperMOTD()
 {
-
 	ConfigReader* conf = new ConfigReader;
 	std::string filename;
 
 	filename = conf->ReadValue("opermotd","file",0);
 
 	opermotd->LoadFile(filename);
-	
+	delete conf;
 }
 
 void ShowOperMOTD(userrec* user)
@@ -54,9 +53,10 @@ void do_opermotd(char** parameters, int pcnt, userrec* user)
 class ModuleOpermotd : public Module
 {
 	public:
-		ModuleOpermotd()
+		ModuleOpermotd(Server* Me)
+			: Module::Module(Me)
 		{
-			Srv = new Server;
+			Srv = Me;
 			
 			Srv->AddCommand("OPERMOTD",do_opermotd,'o',0,"m_opermotd.so");
 			opermotd = new FileReader();
@@ -65,7 +65,6 @@ class ModuleOpermotd : public Module
 
 		virtual ~ModuleOpermotd()
 		{
-			delete Srv;
 		}
 
 		virtual Version GetVersion()
@@ -96,9 +95,9 @@ class ModuleOpermotdFactory : public ModuleFactory
 		{
 		}
 
-		virtual Module* CreateModule()
+		virtual Module* CreateModule(Server* Me)
 		{
-			return new ModuleOpermotd;
+			return new ModuleOpermotd(Me);
 		}
 
 };