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_h.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/modes/cmode_h.cpp') diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp index 0fd4bfa07..493d4f776 100644 --- a/src/modes/cmode_h.cpp +++ b/src/modes/cmode_h.cpp @@ -14,14 +14,9 @@ #include "hashcomp.h" #include "modes/cmode_h.h" -extern InspIRCd* ServerInstance; - -extern std::vector modules; -extern std::vector factory; -extern int MODCOUNT; extern time_t TIME; -ModeChannelHalfOp::ModeChannelHalfOp() : ModeHandler('h', 1, 1, true, MODETYPE_CHANNEL, false) +ModeChannelHalfOp::ModeChannelHalfOp(InspIRCd* Instance) : ModeHandler(Instance, 'h', 1, 1, true, MODETYPE_CHANNEL, false) { } @@ -74,7 +69,7 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr std::string ModeChannelHalfOp::AddHalfOp(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) { @@ -95,14 +90,14 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec } } - return ModeParser::Grant(d,chan,UCMODE_HOP); + return ServerInstance->ModeGrok->Grant(d,chan,UCMODE_HOP); } return ""; } std::string ModeChannelHalfOp::DelHalfOp(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) { @@ -123,7 +118,7 @@ std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec } } - return ModeParser::Revoke(d,chan,UCMODE_HOP); + return ServerInstance->ModeGrok->Revoke(d,chan,UCMODE_HOP); } return ""; } -- cgit v1.3.1-10-gc9f91