X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namedmodes.cpp;h=9d92b8a44137c713d30439fdf7f2e555de14e1e3;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=7d0d3a040a7af2df6530658cf773f01aa5eb0101;hpb=e586aaab7c4f7b03514c83451d73b73f55dc6998;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 7d0d3a040..9d92b8a44 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -29,11 +29,11 @@ static void DisplayList(User* user, Channel* channel)
 		ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_CHANNEL);
 		if (!mh || mh->IsListMode())
 			continue;
-		if (!channel->IsModeSet(letter))
+		if (!channel->IsModeSet(mh))
 			continue;
 		items << " +" << mh->name;
 		if (mh->GetNumParams(true))
-			items << " " << channel->GetModeParameter(letter);
+			items << " " << channel->GetModeParameter(mh);
 	}
 	const std::string line = ":" + ServerInstance->Config->ServerName + " 961 " + user->nick + " " + channel->name;
 	user->SendText(line, items);
@@ -82,7 +82,7 @@ class CommandProp : public Command
 				}
 			}
 		}
-		ServerInstance->SendGlobalMode(modes, src);
+		ServerInstance->Modes->Process(modes, src);
 		return CMD_SUCCESS;
 	}
 };
@@ -105,7 +105,7 @@ class ModuleNamedModes : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(cmd);
 		ServerInstance->Modules->AddService(dummyZ);
@@ -114,7 +114,7 @@ class ModuleNamedModes : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR);
 	}
@@ -124,7 +124,7 @@ class ModuleNamedModes : public Module
 		ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
 	}
 
-	ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters)
+	ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
 		if (!channel)
 			return MOD_RES_PASSTHRU;
@@ -196,7 +196,7 @@ class ModuleNamedModes : public Module
 			}
 		}
 		newparms[1] = modelist;
-		ServerInstance->Modes->Process(newparms, source, false);
+		ServerInstance->Modes->Process(newparms, source);
 		return MOD_RES_DENY;
 	}
 };