X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmode.cpp;h=22173c189aa63ee5dcc63870f2cecbfb0d5464a9;hb=60658d0bdbc8d047c3dbfc19abb005e147b5b2b9;hp=b7a7b7d41b4b243633135bd7fa8755297c908e8b;hpb=f0debf907a36846e3b48767e9797880135a4583b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index b7a7b7d41..22173c189 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -58,7 +58,7 @@ bool ModeHandler::NeedsParam(bool adding) const
 	return false;
 }
 
-std::string ModeHandler::GetUserParameter(User* user)
+std::string ModeHandler::GetUserParameter(const User* user) const
 {
 	return "";
 }
@@ -246,11 +246,12 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, Mode
 			unsigned int ourrank = chan->GetPrefixValue(user);
 			if (ourrank < neededrank)
 			{
-				PrefixMode* neededmh = NULL;
-				for(char c='A'; c <= 'z'; c++)
+				const PrefixMode* neededmh = NULL;
+				const PrefixModeList& prefixmodes = GetPrefixModes();
+				for (PrefixModeList::const_iterator i = prefixmodes.begin(); i != prefixmodes.end(); ++i)
 				{
-					PrefixMode* privmh = FindPrefixMode(c);
-					if (privmh && privmh->GetPrefixRank() >= neededrank)
+					const PrefixMode* const privmh = *i;
+					if (privmh->GetPrefixRank() >= neededrank)
 					{
 						// this mode is sufficient to allow this action
 						if (!neededmh || privmh->GetPrefixRank() < neededmh->GetPrefixRank())
@@ -866,7 +867,7 @@ void PrefixMode::RemoveMode(Channel* chan, Modes::ChangeList& changelist)
 	const Channel::MemberMap& userlist = chan->GetUsers();
 	for (Channel::MemberMap::const_iterator i = userlist.begin(); i != userlist.end(); ++i)
 	{
-		if (i->second->hasMode(this->GetModeChar()))
+		if (i->second->HasMode(this))
 			changelist.push_remove(this, i->first->nick);
 	}
 }