diff options
| -rw-r--r-- | include/base.h | 6 | ||||
| -rw-r--r-- | src/mode.cpp | 2 | ||||
| -rw-r--r-- | src/modules.cpp | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/base.h b/include/base.h index 46855a06f..e75b4029f 100644 --- a/include/base.h +++ b/include/base.h @@ -200,10 +200,8 @@ typedef const reference<Module> ModuleRef; enum ServiceType { /** is a Command */ SERVICE_COMMAND, - /** is a channel ModeHandler */ - SERVICE_CMODE, - /** is a user ModeHandler */ - SERVICE_UMODE, + /** is a ModeHandler */ + SERVICE_MODE, /** is a metadata descriptor */ SERVICE_METADATA, /** is a data processing provider (MD5, SQL) */ diff --git a/src/mode.cpp b/src/mode.cpp index 637eb7ba5..a632ab516 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -46,7 +46,7 @@ #include "modes/umode_s.h" ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type) - : ServiceProvider(Creator, Name, type == MODETYPE_CHANNEL ? SERVICE_CMODE : SERVICE_UMODE), m_paramtype(TR_TEXT), + : ServiceProvider(Creator, Name, SERVICE_MODE), m_paramtype(TR_TEXT), parameters_taken(Params), mode(modeletter), prefix(0), oper(false), list(false), m_type(type), levelrequired(HALFOP_VALUE) { diff --git a/src/modules.cpp b/src/modules.cpp index 52a25d37c..bfe0deecb 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -433,8 +433,7 @@ void ModuleManager::AddService(ServiceProvider& item) if (!ServerInstance->Parser->AddCommand(static_cast<Command*>(&item))) throw ModuleException("Command "+std::string(item.name)+" already exists."); return; - case SERVICE_CMODE: - case SERVICE_UMODE: + case SERVICE_MODE: if (!ServerInstance->Modes->AddMode(static_cast<ModeHandler*>(&item))) throw ModuleException("Mode "+std::string(item.name)+" already exists."); return; |