diff options
| -rw-r--r-- | include/account.h | 8 | ||||
| -rw-r--r-- | include/bots.h | 2 | ||||
| -rw-r--r-- | include/regchannel.h | 6 | ||||
| -rw-r--r-- | include/services.h | 8 | ||||
| -rw-r--r-- | modules/core/db_plain.cpp | 2 | ||||
| -rw-r--r-- | src/bots.cpp | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/include/account.h b/include/account.h index 1a0c5a751..b4a792caf 100644 --- a/include/account.h +++ b/include/account.h @@ -42,7 +42,7 @@ enum NickNameFlag }; const Anope::string NickNameFlagStrings[] = { - "NS_BEGIN", "NS_FORBIDDEN", "NS_NO_EXPIRE", "NS_HELD", "NS_COLLIDED", "" + "BEGIN", "FORBIDDEN", "NO_EXPIRE", "HELD", "COLLIDED", "" }; /** Flags set on NickCores @@ -90,9 +90,9 @@ enum NickCoreFlag }; const Anope::string NickCoreFlagStrings[] = { - "NI_BEGIN", "NI_KILLPROTECT", "NI_SECURE", "NI_MSG", "NI_MEMO_HARDMAX", "NI_MEMO_SIGNON", "NI_MEMO_RECEIVE", - "NI_PRIVATE", "NI_HIDE_EMAIL", "NI_HIDE_MASK", "NI_HIDE_QUIT", "NI_KILL_QUICK", "NI_KILL_IMMED", - "NI_MEMO_MAIL", "NI_HIDE_STATUS", "NI_SUSPENDED", "NI_AUTOOP", "NI_FORBIDDEN", "" + "BEGIN", "KILLPROTECT", "SECURE", "MSG", "MEMO_HARDMAX", "MEMO_SIGNON", "MEMO_RECEIVE", + "PRIVATE", "HIDE_EMAIL", "HIDE_MASK", "HIDE_QUIT", "KILL_QUICK", "KILL_IMMED", + "MEMO_MAIL", "HIDE_STATUS", "SUSPENDED", "AUTOOP", "FORBIDDEN", "" }; class CoreExport NickRequest : public Extensible diff --git a/include/bots.h b/include/bots.h index 2cd8b0766..84c4fa2ec 100644 --- a/include/bots.h +++ b/include/bots.h @@ -29,6 +29,8 @@ enum BotFlag BI_END }; +static const Anope::string BotFlagString[] = { "BEGIN", "CORE", "PRIVATE", "" }; + class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END> { public: diff --git a/include/regchannel.h b/include/regchannel.h index 298e35798..5d1735cb3 100644 --- a/include/regchannel.h +++ b/include/regchannel.h @@ -63,9 +63,9 @@ enum ChannelInfoFlag }; const Anope::string ChannelInfoFlagStrings[] = { - "CI_BEGIN", "CI_INHABIT", "CI_KEEPTOPIC", "CI_SECUREOPS", "CI_PRIVATE", "CI_TOPICLOCK", "CI_RESTRICTED", - "CI_PEACE", "CI_SECURE", "CI_FORBIDDEN", "CI_NO_EXPIRE", "CI_MEMO_HARDMAX", "CI_OPNOTICE", "CI_SECUREFOUNDER", - "CI_SIGNKICK", "CI_SIGNKICK_LEVEL", "CI_XOP", "CI_SUSPENDED", "CI_PERSIST", "" + "BEGIN", "INHABIT", "KEEPTOPIC", "SECUREOPS", "PRIVATE", "TOPICLOCK", "RESTRICTED", + "PEACE", "SECURE", "FORBIDDEN", "NO_EXPIRE", "MEMO_HARDMAX", "OPNOTICE", "SECUREFOUNDER", + "SIGNKICK", "SIGNKICK_LEVEL", "XOP", "SUSPENDED", "PERSIST", "" }; struct ModeLock diff --git a/include/services.h b/include/services.h index 80160d676..fbc6420fb 100644 --- a/include/services.h +++ b/include/services.h @@ -746,10 +746,10 @@ enum BotServFlag }; const Anope::string BotServFlagStrings[] = { - "BS_BEGIN", "BS_DONTKICKOPS", "BS_DONTKICKVOICES", "BS_FANTASY", "BS_SYMBIOSIS", "BS_GREET", "BS_NOBOT", - "BS_KICK_BOLDs", "BS_KICK_COLORS", "BS_KICK_REVERSES", "BS_KICK_UNDERLINES", "BS_KICK_BADWORDS", "BS_KICK_CAPS", - "BS_KICK_FLOOD", "BS_KICK_REPEAT", "BS_KICK_ITALICS", "BS_KICK_AMSGS", "BS_MSG_PRIVMSG", "BS_MSG_NOTICE", - "BS_MSG_NOTICEOPS", "" + "BEGIN", "DONTKICKOPS", "DONTKICKVOICES", "FANTASY", "SYMBIOSIS", "GREET", "NOBOT", + "KICK_BOLDs", "KICK_COLORS", "KICK_REVERSES", "KICK_UNDERLINES", "KICK_BADWORDS", "KICK_CAPS", + "KICK_FLOOD", "KICK_REPEAT", "KICK_ITALICS", "KICK_AMSGS", "MSG_PRIVMSG", "MSG_NOTICE", + "MSG_NOTICEOPS", "" }; /* Indices for TTB (Times To Ban) */ diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp index 52e9048fe..fbce20c47 100644 --- a/modules/core/db_plain.cpp +++ b/modules/core/db_plain.cpp @@ -697,7 +697,7 @@ class DBPlain : public Module if (params[0].equals_ci("NAME")) ci->bi = findbot(params[1]); else if (params[0].equals_ci("FLAGS")) - ci->FromString(params); + ci->botflags.FromString(params); else if (params[0].equals_ci("TTB")) { for (unsigned j = 1, end = params.size(); j < end; j += 2) diff --git a/src/bots.cpp b/src/bots.cpp index e5b29fbf7..4f3ed76c9 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -20,8 +20,6 @@ BotInfo *MemoServ = NULL; BotInfo *NickServ = NULL; BotInfo *OperServ = NULL; -static const Anope::string BotFlagString[] = { "1", "BI_CORE", "BI_PRIVATE", "" }; - BotInfo::BotInfo(const Anope::string &nnick, const Anope::string &nuser, const Anope::string &nhost, const Anope::string &nreal) : User(nnick, nuser, nhost, ts6_uid_retrieve()), Flags<BotFlag, BI_END>(BotFlagString) { this->realname = nreal; |