X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=f034d5b43c691e43d7cf05e8877d54157d913499;hb=fd6ee21f2f55875984884a8413d61012e066029f;hp=2e7cd9fe1a5ffc20c79a12bc9e34fedbee3707bb;hpb=dc8f5d02f77aeabefaefe88005b99c8b47030ab7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 2e7cd9fe1..f034d5b43 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -35,13 +35,15 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
+
+
 
-static Server *Srv;
 	 
 class cmd_samode : public command_t
 {
  public:
-	cmd_samode () : command_t("SAMODE", 'o', 2)
+ cmd_samode (InspIRCd* Instance) : command_t(Instance,"SAMODE", 'o', 2)
 	{
 		this->source = "m_samode.so";
 		syntax = "<target> <modes> {<mode-parameters>}";
@@ -53,12 +55,12 @@ class cmd_samode : public command_t
 		 * Handles an SAMODE request. Notifies all +s users.
 	 	 */
 		std::string result;
-		Srv->Log(DEBUG,"SAMODE: Being handled");
-		userrec* n = new userrec();
+		log(DEBUG,"SAMODE: Being handled");
+		userrec* n = new userrec(ServerInstance);
 		n->fd = FD_MAGIC_NUMBER;
-		Srv->SendMode(parameters,pcnt,n);
+		ServerInstance->SendMode(parameters,pcnt,n);
 		delete n;
-		Srv->Log(DEBUG,"SAMODE: Modechange handled");
+		log(DEBUG,"SAMODE: Modechange handled");
 		result = std::string(user->nick);
 		result.append(" used SAMODE");
 	  	for (int n = 0; n < pcnt; n++)
@@ -66,7 +68,7 @@ class cmd_samode : public command_t
 			result.append(" ");
 			result.append(parameters[n]);
 		}
-		Srv->SendOpers(result);
+		ServerInstance->WriteOpers(result);
 	}
 };
 
@@ -74,12 +76,12 @@ class ModuleSaMode : public Module
 {
 	cmd_samode*	mycommand;
  public:
-	ModuleSaMode(Server* Me)
+	ModuleSaMode(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_samode();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_samode(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleSaMode()
@@ -104,7 +106,7 @@ class ModuleSaModeFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleSaMode(Me);
 	}