From d0b4bb3811458aa335857514e4cbb95d5c84f433 Mon Sep 17 00:00:00 2001 From: brain Date: Thu, 10 Aug 2006 23:53:48 +0000 Subject: Last of Server:: methods moved to InspIRCd::. Server:: removed. This will need a real good tidyup later, because now everything is in the right place, but its a mess because for now i threw them into place (e.g. space indenting, etc) Next on the todo: Make command handlers have a ServerInstance (gank!) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4861 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_services_account.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/modules/m_services_account.cpp') diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp index 648191e3d..6248f6f03 100644 --- a/src/modules/m_services_account.cpp +++ b/src/modules/m_services_account.cpp @@ -115,7 +115,7 @@ class AChannel_M : public ModeHandler class ModuleServicesAccount : public Module { - Server *Srv; + AChannel_R* m1; AChannel_M* m2; AUser_R* m3; @@ -126,9 +126,9 @@ class ModuleServicesAccount : public Module m1 = new AChannel_R(ServerInstance); m2 = new AChannel_M(ServerInstance); m3 = new AUser_R(ServerInstance); - Srv->AddMode(m1, 'R'); - Srv->AddMode(m2, 'M'); - Srv->AddMode(m3, 'R'); + ServerInstance->AddMode(m1, 'R'); + ServerInstance->AddMode(m2, 'M'); + ServerInstance->AddMode(m3, 'R'); } virtual void On005Numeric(std::string &output) @@ -165,7 +165,7 @@ class ModuleServicesAccount : public Module if ((c->IsModeSet('M')) && (!account)) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,""))) + if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server)) || (!strcmp(user->server,""))) { // user is ulined, can speak regardless return 0; @@ -182,7 +182,7 @@ class ModuleServicesAccount : public Module if ((u->modes['R'-65]) && (!account)) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) + if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server))) { // user is ulined, can speak regardless return 0; @@ -212,7 +212,7 @@ class ModuleServicesAccount : public Module { if (!account) { - if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server))) + if ((ServerInstance->IsUlined(user->nick)) || (ServerInstance->IsUlined(user->server))) { // user is ulined, won't be stopped from joining return 0; -- cgit v1.3.1-10-gc9f91