From ca0083cba90c8830f5018b73eb715665a8db9dd7 Mon Sep 17 00:00:00 2001 From: attilamolnar Date: Tue, 9 Apr 2013 19:12:09 +0200 Subject: Replace IS_AWAY() and IS_OPER() macros with User::IsAway() and User::IsOper() --- src/modules/m_override.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules/m_override.cpp') diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index 62fdfc8c9..81f4230eb 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -68,7 +68,7 @@ class ModuleOverride : public Module ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) { - if (IS_LOCAL(source) && IS_OPER(source) && CanOverride(source, "TOPIC")) + if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC")) { if (!channel->HasUser(source) || (channel->IsModeSet('t') && channel->GetPrefixValue(source) < HALFOP_VALUE)) { @@ -84,7 +84,7 @@ class ModuleOverride : public Module ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) { - if (IS_OPER(source) && CanOverride(source,"KICK")) + if (source->IsOper() && CanOverride(source,"KICK")) { // If the kicker's status is less than the target's, or the kicker's status is less than or equal to voice if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE)) @@ -100,7 +100,7 @@ class ModuleOverride : public Module { if (!source || !channel) return MOD_RES_PASSTHRU; - if (!IS_OPER(source) || !IS_LOCAL(source)) + if (!source->IsOper() || !IS_LOCAL(source)) return MOD_RES_PASSTHRU; unsigned int mode = channel->GetPrefixValue(source); @@ -118,7 +118,7 @@ class ModuleOverride : public Module ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) { - if (IS_LOCAL(user) && IS_OPER(user)) + if (IS_LOCAL(user) && user->IsOper()) { if (chan) { -- cgit v1.2.3