From f9636a2eff46f6829bf9e01c711ab1ba45a7d50a Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 10 Aug 2006 22:40:57 +0000 Subject: So much stuff changed in this one, i forgot most of it. Oh yeah, main thing is ModeHandler and ModeWatcher classes now take an InspIRCd* to their constructor git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4858 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modes/cmode_o.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/modes/cmode_o.cpp') diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index 75e088635..528cd4ede 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -14,14 +14,9 @@ #include "hashcomp.h" #include "modes/cmode_o.h" -extern InspIRCd* ServerInstance; - -extern std::vector modules; -extern std::vector factory; -extern int MODCOUNT; extern time_t TIME; -ModeChannelOp::ModeChannelOp() : ModeHandler('o', 1, 1, true, MODETYPE_CHANNEL, false) +ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false) { } @@ -65,7 +60,7 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status) { - userrec *d = ModeParser::SanityChecks(user,dest,chan,status); + userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status); if (d) { @@ -86,14 +81,14 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in } } - return ModeParser::Grant(d,chan,UCMODE_OP); + return ServerInstance->ModeGrok->Grant(d,chan,UCMODE_OP); } return ""; } std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status) { - userrec *d = ModeParser::SanityChecks(user,dest,chan,status); + userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status); if (d) { @@ -117,7 +112,7 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in } } - return ModeParser::Revoke(d,chan,UCMODE_OP); + return ServerInstance->ModeGrok->Revoke(d,chan,UCMODE_OP); } return ""; } -- cgit v1.2.3