X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=d931891c2e67a1ad86e578e6224da831cdd303fe;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=e37282525df5054ca2639f9b7f51b27cc6fd7670;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index e37282525..d931891c2 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -61,7 +61,7 @@ class ModuleOverride : public Module
 	bool CanOverride(User* source, const char* token)
 	{
 		// checks to see if the oper's type has <type:override>
-		override_t::iterator j = overrides.find(source->oper);
+		override_t::iterator j = overrides.find(source->oper->name);
 
 		if (j != overrides.end())
 		{
@@ -132,10 +132,10 @@ class ModuleOverride : public Module
 		{
 			if (chan)
 			{
-				if ((chan->modes[CM_INVITEONLY]) && (CanOverride(user,"INVITE")))
+				if (chan->IsModeSet('i') && (CanOverride(user,"INVITE")))
 				{
 					irc::string x(chan->name.c_str());
-					if (!user->IsInvited(x))
+					if (!IS_LOCAL(user)->IsInvited(x))
 					{
 						if (RequireKey && keygiven != "override")
 						{
@@ -151,7 +151,7 @@ class ModuleOverride : public Module
 					return MOD_RES_ALLOW;
 				}
 
-				if ((chan->modes[CM_KEY]) && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
+				if (chan->IsModeSet('k') && (CanOverride(user,"KEY")) && keygiven != chan->GetModeParameter('k'))
 				{
 					if (RequireKey && keygiven != "override")
 					{
@@ -166,7 +166,7 @@ class ModuleOverride : public Module
 					return MOD_RES_ALLOW;
 				}
 
-				if ((chan->modes[CM_LIMIT]) && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT")))
+				if (chan->IsModeSet('l') && (chan->GetUserCounter() >= atoi(chan->GetModeParameter('l').c_str())) && (CanOverride(user,"LIMIT")))
 				{
 					if (RequireKey && keygiven != "override")
 					{