diff options
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/cs_mode.cpp | 9 | ||||
| -rw-r--r-- | modules/core/db_plain.cpp | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/modules/core/cs_mode.cpp b/modules/core/cs_mode.cpp index 6399bdc35..4d3705845 100644 --- a/modules/core/cs_mode.cpp +++ b/modules/core/cs_mode.cpp @@ -164,16 +164,13 @@ class CommandCSMode : public Command case '*': if (adding == -1) break; - for (std::map<Anope::string, Mode *>::const_iterator it = ModeManager::Modes.begin(), it_end = ModeManager::Modes.end(); it != it_end; ++it) + for (unsigned j = 0; j < ModeManager::ChannelModes.size(); ++j) { - Mode *m = it->second; - if (m->Class == MC_CHANNEL) + ChannelMode *cm = ModeManager::ChannelModes[j]; + if (cm->CanSet(u)) { - ChannelMode *cm = debug_cast<ChannelMode *>(m); if (cm->Type == MODE_REGULAR || (!adding && cm->Type == MODE_PARAM)) { - if (!cm->CanSet(u)) - continue; if (adding) ci->c->SetMode(NULL, cm); else diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp index 4dbf864de..44b5cbefa 100644 --- a/modules/core/db_plain.cpp +++ b/modules/core/db_plain.cpp @@ -848,7 +848,7 @@ class DBPlain : public Module ChannelMode *cm = ModeManager::FindChannelModeByName(ml.name); if (!cm || cm->Type != MODE_REGULAR) continue; - db_buffer << " " << cm->NameAsString; + db_buffer << " " << cm->NameAsString(); } } } @@ -870,7 +870,7 @@ class DBPlain : public Module ChannelMode *cm = ModeManager::FindChannelModeByName(ml.name); if (!cm || cm->Type != MODE_REGULAR) continue; - db_buffer << " " << cm->NameAsString; + db_buffer << " " << cm->NameAsString(); } } } @@ -895,7 +895,7 @@ class DBPlain : public Module continue; if (!ml.param.empty()) - db_buffer << "MD MLP" << (ml.set ? " " : "_OFF ") << cm->NameAsString << " " << ml.param << endl; + db_buffer << "MD MLP" << (ml.set ? " " : "_OFF ") << cm->NameAsString() << " " << ml.param << endl; } } } |