X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=116042ae62f31958ceeae1857de6277a28cffc3b;hb=6ab1d0dffb8084bf6a2ad8a446a3836fa3760c8a;hp=16c3a529579cb978afe2c76ea090dc3b73c74aca;hpb=80005149269014babdcacd76f2be1d7249c489eb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 16c3a5295..116042ae6 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -58,7 +58,7 @@ class ModuleOverride : public Module
 			overrides[typen] = tokenlist;
 		}
 		
-		delete Conf;
+		DELETE(Conf);
 	}
 
 	void Implements(char* List)
@@ -209,7 +209,7 @@ class ModuleOverride : public Module
 						if (!user->IsInvited(x))
 						{
 							/* XXX - Ugly cast for a parameter that isn't used? :< - Om */
-							WriteChannelWithServ((char*)Srv->GetServerName().c_str(), chan, "NOTICE %s :%s invited himself into the channel",cname,user->nick);
+							chan->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s invited himself into the channel", cname, user->nick);
 						}
 					}
 					Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +i on "+std::string(cname));
@@ -219,7 +219,7 @@ class ModuleOverride : public Module
 				if ((chan->key[0]) && (CanOverride(user,"KEY")))
 				{
 					if (NoisyOverride)
-						WriteChannelWithServ((char*)Srv->GetServerName().c_str(),chan,"NOTICE %s :%s bypassed the channel key",cname,user->nick);
+						chan->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s bypassed the channel key", cname, user->nick);
 					Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +k on "+std::string(cname));
 					return -1;
 				}
@@ -227,7 +227,7 @@ class ModuleOverride : public Module
 				if ((chan->limit > 0) && (Srv->CountUsers(chan) >=  chan->limit) && (CanOverride(user,"LIMIT")))
 				{
 					if (NoisyOverride)
-						WriteChannelWithServ((char*)Srv->GetServerName().c_str(),chan,"NOTICE %s :%s passed through your channel limit",cname,user->nick);
+						chan->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :%s passed through your channel limit", cname, user->nick);
 					Srv->SendOpers("*** "+std::string(user->nick)+" used operoverride to bypass +l on "+std::string(cname));
 					return -1;
 				}