diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-09-02 12:25:54 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-09-12 14:44:17 +0200 |
| commit | 52e4d9c96c83ca4bbbeb487966ac2897a384907d (patch) | |
| tree | bf97357669eb566d1adab2b9824feeda75e71ad9 /src | |
| parent | e35772f19024fb12edda9cff19d3812272f444db (diff) | |
Add ModeHandler::IsListModeBase() and MC_LIST
Diffstat (limited to 'src')
| -rw-r--r-- | src/listmode.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_rmode.cpp | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/listmode.cpp b/src/listmode.cpp index f7890f9ad..4ab15b2dc 100644 --- a/src/listmode.cpp +++ b/src/listmode.cpp @@ -20,7 +20,7 @@ #include "listmode.h" ListModeBase::ListModeBase(Module* Creator, const std::string& Name, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag) - : ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL), + : ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL, MC_LIST), listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy), configtag(ctag), extItem("listbase_mode_" + name + "_list", Creator) { diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp index 6d17820a5..dde9f496e 100644 --- a/src/modules/m_rmode.cpp +++ b/src/modules/m_rmode.cpp @@ -62,12 +62,7 @@ class CommandRMode : public Command ListModeBase::ModeList* ml; irc::modestacker modestack(false); - if (!mh->IsListMode()) - { - if (chan->IsModeSet(mh)) - modestack.Push(modeletter); - } - else if ((pm = mh->IsPrefixMode())) + if ((pm = mh->IsPrefixMode())) { // As user prefix modes don't have a GetList() method, let's iterate through the channel's users. for (UserMembIter it = chan->userlist.begin(); it != chan->userlist.end(); ++it) @@ -78,7 +73,7 @@ class CommandRMode : public Command modestack.Push(modeletter, it->first->nick); } } - else if (((lm = dynamic_cast<ListModeBase*>(mh)) != NULL) && ((ml = lm->GetList(chan)) != NULL)) + else if ((lm = mh->IsListModeBase()) && ((ml = lm->GetList(chan)) != NULL)) { for (ListModeBase::ModeList::iterator it = ml->begin(); it != ml->end(); ++it) { @@ -89,8 +84,8 @@ class CommandRMode : public Command } else { - user->WriteNotice("Could not remove channel mode " + ConvToStr(modeletter)); - return CMD_FAILURE; + if (chan->IsModeSet(mh)) + modestack.Push(modeletter); } parameterlist stackresult; |