diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modes/cmode_t.cpp | 16 | ||||
| -rw-r--r-- | src/modules/m_knock.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_override.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_redirect.cpp | 2 |
4 files changed, 6 insertions, 20 deletions
diff --git a/src/modes/cmode_t.cpp b/src/modes/cmode_t.cpp index b85922b06..b9b108f5f 100644 --- a/src/modes/cmode_t.cpp +++ b/src/modes/cmode_t.cpp @@ -17,20 +17,6 @@ #include "users.h" #include "modes/cmode_t.h" -ModeChannelTopicOps::ModeChannelTopicOps() : ModeHandler(NULL, "topic", 't', PARAM_NONE, MODETYPE_CHANNEL) +ModeChannelTopicOps::ModeChannelTopicOps() : SimpleChannelModeHandler(NULL, "topic", 't') { } - -ModeAction ModeChannelTopicOps::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding) -{ - if (channel->modes[CM_TOPICLOCK] != adding) - { - channel->modes[CM_TOPICLOCK] = adding; - return MODEACTION_ALLOW; - } - else - { - return MODEACTION_DENY; - } -} - diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 3e794547e..04b843c86 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -49,7 +49,7 @@ class CommandKnock : public Command return CMD_FAILURE; } - if (!c->modes[CM_INVITEONLY]) + if (!c->IsModeSet('i')) { user->WriteNumeric(480, "%s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick.c_str(), c->name.c_str()); return CMD_FAILURE; diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp index cf18495b5..d931891c2 100644 --- a/src/modules/m_override.cpp +++ b/src/modules/m_override.cpp @@ -132,7 +132,7 @@ class ModuleOverride : public Module { if (chan) { - if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE"))) + if (chan->IsModeSet('i') && (CanOverride(user,"INVITE"))) { irc::string x(chan->name.c_str()); if (!IS_LOCAL(user)->IsInvited(x)) @@ -151,7 +151,7 @@ class ModuleOverride : public Module return MOD_RES_ALLOW; } - if ((chan->modes[CM_KEY]) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k')) + if (chan->IsModeSet('k') && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k')) { if (RequireKey && keygiven != "override") { @@ -166,7 +166,7 @@ class ModuleOverride : public Module return MOD_RES_ALLOW; } - if ((chan->modes[CM_LIMIT]) && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT"))) + if (chan->IsModeSet('l') && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT"))) { if (RequireKey && keygiven != "override") { diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index 50d2e929f..ff7fb6ac4 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -96,7 +96,7 @@ class ModuleRedirect : public Module { if (chan) { - if (chan->IsModeSet('L') && chan->modes[CM_LIMIT]) + if (chan->IsModeSet('L') && chan->IsModeSet('l')) { if (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) { |