From e4839dc44353952dde32620035c07863b918eb15 Mon Sep 17 00:00:00 2001 From: peavey Date: Sun, 11 Oct 2009 18:03:17 +0000 Subject: Move 2 static extensibles from user class to inspircd class for global access in an attempt to further fix windows build. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11838 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_nicklock.cpp | 2 +- src/modules/m_nonicks.cpp | 2 +- src/modules/m_spanningtree/main.cpp | 2 +- src/modules/m_spanningtree/operquit.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index 755ae6da4..0ca0a9bac 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -178,7 +178,7 @@ class ModuleNickLock : public Module if (isdigit(newnick[0])) /* Allow a switch to a UID */ return MOD_RES_PASSTHRU; - if (User::NICKForced.get(user)) /* Allow forced nick changes */ + if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */ return MOD_RES_PASSTHRU; if (locked.get(user)) diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp index e811b8e67..22b0067cc 100644 --- a/src/modules/m_nonicks.cpp +++ b/src/modules/m_nonicks.cpp @@ -78,7 +78,7 @@ class ModuleNoNickChange : public Module return MOD_RES_PASSTHRU; // Allow forced nick changes. - if (User::NICKForced.get(user)) + if (ServerInstance->NICKForced.get(user)) return MOD_RES_PASSTHRU; for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++) diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index e71e55ae8..9c0997d7c 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -743,7 +743,7 @@ void ModuleSpanningTree::OnRemoteKill(User* source, User* dest, const std::strin if (!IS_LOCAL(source)) return; // Only start routing if we're origin. - User::OperQuit.set(dest, operreason); + ServerInstance->OperQuit.set(dest, operreason); parameterlist params; params.push_back(":"+operreason); Utils->DoOneToMany(dest->uuid,"OPERQUIT",params); diff --git a/src/modules/m_spanningtree/operquit.cpp b/src/modules/m_spanningtree/operquit.cpp index 9128baa0f..faf150be7 100644 --- a/src/modules/m_spanningtree/operquit.cpp +++ b/src/modules/m_spanningtree/operquit.cpp @@ -30,7 +30,7 @@ bool TreeSocket::OperQuit(const std::string &prefix, parameterlist ¶ms) if (u) { - User::OperQuit.set(u, params[0]); + ServerInstance->OperQuit.set(u, params[0]); params[0] = ":" + params[0]; Utils->DoOneToAllButSender(prefix,"OPERQUIT",params,prefix); } -- cgit v1.2.3