summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2009-04-06 00:07:29 +0000
committerpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2009-04-06 00:07:29 +0000
commitfcafba14c5408360ec725ed1649ede75b7ae52c1 (patch)
tree32c6b69a76f125a4e117e99cf7a8532b4edf6dbf
parent403fe8fd978eca00f07aebd7c3d1771075563e14 (diff)
Weed out a few leftover server instances from before modules had ServerInstance. Patch by Ankit.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11287 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/m_banredirect.cpp6
-rw-r--r--src/modules/m_invisible.cpp4
-rw-r--r--src/modules/m_shun.cpp5
3 files changed, 4 insertions, 11 deletions
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 139769267..a589d5c71 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -37,11 +37,9 @@ typedef std::deque<std::string> StringDeque;
class BanRedirect : public ModeWatcher
{
- private:
- InspIRCd* Srv;
public:
BanRedirect(InspIRCd* Instance)
- : ModeWatcher(Instance, 'b', MODETYPE_CHANNEL), Srv(Instance)
+ : ModeWatcher(Instance, 'b', MODETYPE_CHANNEL)
{
}
@@ -118,7 +116,7 @@ class BanRedirect : public ModeWatcher
if(mask[CHAN].length())
{
- if(!IS_LOCAL(source) || Srv->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax))
+ if(!IS_LOCAL(source) || ServerInstance->IsChannel(mask[CHAN].c_str(), ServerInstance->Config->Limits.ChanMax))
{
if (assign(channel->name) == mask[CHAN])
{
diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 965ff2635..860bf5c4a 100644
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -107,10 +107,8 @@ class InvisibleMode : public ModeHandler
class InvisibleDeOper : public ModeWatcher
{
- private:
- InspIRCd* Srv;
public:
- InvisibleDeOper(InspIRCd* Instance) : ModeWatcher(Instance, 'o', MODETYPE_USER), Srv(Instance)
+ InvisibleDeOper(InspIRCd* Instance) : ModeWatcher(Instance, 'o', MODETYPE_USER)
{
}
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 91be7c10f..6fdc4c772 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -80,11 +80,8 @@ class ShunFactory : public XLineFactory
class CommandShun : public Command
{
- private:
- InspIRCd *Srv;
-
public:
- CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me)
+ CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3)
{
this->source = "m_shun.so";
this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";