diff options
| author | attilamolnar <attilamolnar@hush.com> | 2013-06-18 19:17:39 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2013-07-19 19:40:05 +0200 |
| commit | 2dc01893c67fedb7b249773c43bc83b46086ee5f (patch) | |
| tree | 40a1bc5936628b98b4ae0c0c9427b44cf2cf1809 /src | |
| parent | fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86 (diff) | |
Get rid of enum UserModes and mark User::modes as private
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/m_spanningtree/opertype.cpp | 5 | ||||
| -rw-r--r-- | src/users.cpp | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp index 021100870..9e8c8ed9d 100644 --- a/src/modules/m_spanningtree/opertype.cpp +++ b/src/modules/m_spanningtree/opertype.cpp @@ -32,7 +32,10 @@ CmdResult CommandOpertype::Handle(const std::vector<std::string>& params, User * const std::string& opertype = params[0]; if (!u->IsOper()) ServerInstance->Users->all_opers.push_back(u); - u->modes[UM_OPERATOR] = 1; + + ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER); + u->SetMode(opermh, true); + OperIndex::iterator iter = ServerInstance->Config->oper_blocks.find(" " + opertype); if (iter != ServerInstance->Config->oper_blocks.end()) u->oper = iter->second; diff --git a/src/users.cpp b/src/users.cpp index f4055d464..fe593a139 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -367,10 +367,11 @@ CullResult FakeUser::cull() void User::Oper(OperInfo* info) { - if (this->IsModeSet('o')) + ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER); + if (this->IsModeSet(opermh)) this->UnOper(); - this->modes[UM_OPERATOR] = 1; + this->SetMode(opermh, true); this->oper = info; this->WriteServ("MODE %s :+o", this->nick.c_str()); FOREACH_MOD(I_OnOper, OnOper(this, info->name)); @@ -490,7 +491,8 @@ void User::UnOper() /* remove the user from the oper list. Will remove multiple entries as a safeguard against bug #404 */ ServerInstance->Users->all_opers.remove(this); - this->modes[UM_OPERATOR] = 0; + ModeHandler* opermh = ServerInstance->Modes->FindMode('o', MODETYPE_USER); + this->SetMode(opermh, false); } /* |