Moved the core pseudo clients out into their own modules

1 files changed, 9 insertions, 5 deletions

diff --git a/modules/core/cs_set_topiclock.cpp b/modules/core/cs_set_topiclock.cpp
index 434d9961d..add079c52 100644
--- a/modules/core/cs_set_topiclock.cpp
+++ b/modules/core/cs_set_topiclock.cpp
@@ -12,6 +12,7 @@
 /*************************************************************************/
 
 #include "module.h"
+#include "chanserv.h"
 
 class CommandCSSetTopicLock : public Command
 {
@@ -50,7 +51,7 @@ class CommandCSSetTopicLock : public Command
 				"Enables or disables the \002topic lock\002 option for a channel.\n"
 				"When \002topic lock\002 is set, %s will not allow the\n"
 				"channel topic to be changed except via the \002TOPIC\002\n"
-				"command."), this->name.c_str(), ChanServ->nick.c_str());
+				"command."), this->name.c_str(), Config->s_ChanServ.c_str());
 		return true;
 	}
 
@@ -84,22 +85,25 @@ class CSSetTopicLock : public Module
 		this->SetAuthor("Anope");
 		this->SetType(CORE);
 
-		Command *c = FindCommand(ChanServ, "SET");
+		if (!chanserv)
+			throw ModuleException("ChanServ is not loaded!");
+
+		Command *c = FindCommand(chanserv->Bot(), "SET");
 		if (c)
 			c->AddSubcommand(this, &commandcssettopiclock);
 
-		c = FindCommand(ChanServ, "SASET");
+		c = FindCommand(chanserv->Bot(), "SASET");
 		if (c)
 			c->AddSubcommand(this, &commandcssasettopiclock);
 	}
 
 	~CSSetTopicLock()
 	{
-		Command *c = FindCommand(ChanServ, "SET");
+		Command *c = FindCommand(chanserv->Bot(), "SET");
 		if (c)
 			c->DelSubcommand(&commandcssettopiclock);
 
-		c = FindCommand(ChanServ, "SASET");
+		c = FindCommand(chanserv->Bot(), "SASET");
 		if (c)
 			c->DelSubcommand(&commandcssasettopiclock);
 	}