From 8933c4b9ff010851285e3f773da2982a746d2c0b Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 8 May 2021 17:50:24 +0100 Subject: Switch Channel::ChanModes to use the channel mode map. --- src/channels.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/channels.cpp') diff --git a/src/channels.cpp b/src/channels.cpp index 6b885735c..d1e318b51 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -402,13 +402,11 @@ const char* Channel::ChanModes(bool showsecret) scratch.clear(); - /* This was still iterating up to 190, Channel::modes is only 64 elements -- Om */ - for(int n = 0; n < 64; n++) + for (const auto& [_, mh] : ServerInstance->Modes.GetModes(MODETYPE_CHANNEL)) { - ModeHandler* mh = ServerInstance->Modes.FindMode(n + 65, MODETYPE_CHANNEL); - if (mh && IsModeSet(mh)) + if (IsModeSet(mh)) { - scratch.push_back(n + 65); + scratch.push_back(mh->GetModeChar()); ParamModeBase* pm = mh->IsParameterMode(); if (!pm) -- cgit v1.3.1-10-gc9f91