diff options
Diffstat (limited to 'src/modes')
| -rw-r--r-- | src/modes/cmode_b.cpp | 2 | ||||
| -rw-r--r-- | src/modes/cmode_h.cpp | 20 | ||||
| -rw-r--r-- | src/modes/cmode_o.cpp | 26 | ||||
| -rw-r--r-- | src/modes/cmode_v.cpp | 26 |
4 files changed, 37 insertions, 37 deletions
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index 47913bdc0..d0c783ad9 100644 --- a/src/modes/cmode_b.cpp +++ b/src/modes/cmode_b.cpp @@ -71,7 +71,7 @@ std::string& ModeChannelBan::AddBan(userrec *user,std::string &dest,chanrec *cha if (dest == "") return dest; - long maxbans = GetMaxBans(chan->name); + long maxbans = chan->GetMaxBans(); if ((unsigned)chan->bans.size() > (unsigned)maxbans) { user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %d)",user->nick, chan->name,chan->name,maxbans); diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp index 5137bfd4a..49bf08288 100644 --- a/src/modes/cmode_h.cpp +++ b/src/modes/cmode_h.cpp @@ -16,7 +16,7 @@ #include "modes/cmode_h.h" extern InspIRCd* ServerInstance; -extern InspIRCd* ServerInstance; + extern std::vector<Module*> modules; extern std::vector<ircd_module*> factory; extern int MODCOUNT; @@ -28,17 +28,17 @@ ModeChannelHalfOp::ModeChannelHalfOp() : ModeHandler('h', 1, 1, true, MODETYPE_C ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) { - userrec* x = Find(parameter); + userrec* x = ServerInstance->FindNick(parameter); if (x) { - if (cstatus(x, channel) == STATUS_HOP) - { - return std::make_pair(true, x->nick); - } - else - { - return std::make_pair(false, parameter); - } + if (cstatus(x, channel) == STATUS_HOP) + { + return std::make_pair(true, x->nick); + } + else + { + return std::make_pair(false, parameter); + } } return std::make_pair(false, parameter); } diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index e8c3cbed7..580fcc636 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -16,7 +16,7 @@ #include "modes/cmode_o.h" extern InspIRCd* ServerInstance; -extern InspIRCd* ServerInstance; + extern std::vector<Module*> modules; extern std::vector<ircd_module*> factory; extern int MODCOUNT; @@ -28,18 +28,18 @@ ModeChannelOp::ModeChannelOp() : ModeHandler('o', 1, 1, true, MODETYPE_CHANNEL, ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) { - userrec* x = Find(parameter); - if (x) - { - if (cstatus(x, channel) == STATUS_OP) - { - return std::make_pair(true, x->nick); - } - else - { - return std::make_pair(false, parameter); - } - } + userrec* x = ServerInstance->FindNick(parameter); + if (x) + { + if (cstatus(x, channel) == STATUS_OP) + { + return std::make_pair(true, x->nick); + } + else + { + return std::make_pair(false, parameter); + } + } return std::make_pair(false, parameter); } diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp index ddac844ec..b93a04f49 100644 --- a/src/modes/cmode_v.cpp +++ b/src/modes/cmode_v.cpp @@ -16,7 +16,7 @@ #include "modes/cmode_v.h" extern InspIRCd* ServerInstance; -extern InspIRCd* ServerInstance; + extern std::vector<Module*> modules; extern std::vector<ircd_module*> factory; extern int MODCOUNT; @@ -28,18 +28,18 @@ ModeChannelVoice::ModeChannelVoice() : ModeHandler('v', 1, 1, true, MODETYPE_CHA ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) { - userrec* x = Find(parameter); - if (x) - { - if (cstatus(x, channel) == STATUS_VOICE) - { - return std::make_pair(true, x->nick); - } - else - { - return std::make_pair(false, parameter); - } - } + userrec* x = ServerInstance->FindNick(parameter); + if (x) + { + if (cstatus(x, channel) == STATUS_VOICE) + { + return std::make_pair(true, x->nick); + } + else + { + return std::make_pair(false, parameter); + } + } return std::make_pair(false, parameter); } |