X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_topic.cpp;h=d303830243e621d6604dc8f8ea523888f3ce3e76;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=06036fe010cf0d298356f90c7d8809e65007555e;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index 06036fe01..d30383024 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -11,11 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "commands/cmd_topic.h"
 #include "inspircd.h"
+#include "commands/cmd_topic.h"
 
 
 extern "C" DllExport command_t* init_command(InspIRCd* Instance)
@@ -32,7 +29,7 @@ CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
 		Ptr = ServerInstance->FindChan(parameters[0]);
 		if (Ptr)
 		{
-			if ((Ptr->modes[CM_SECRET]) && (!Ptr->HasUser(user)))
+			if ((Ptr->IsModeSet('s')) && (!Ptr->HasUser(user)))
 			{
 				user->WriteServ("401 %s %s :No such nick/channel",user->nick, Ptr->name);
 				return CMD_FAILURE;
@@ -66,7 +63,7 @@ CmdResult cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
 					user->WriteServ("442 %s %s :You're not on that channel!",user->nick, Ptr->name);
 					return CMD_FAILURE;
 				}
-				if ((Ptr->modes[CM_TOPICLOCK]) && (Ptr->GetStatus(user) < STATUS_HOP))
+				if ((Ptr->IsModeSet('t')) && (Ptr->GetStatus(user) < STATUS_HOP))
 				{
 					user->WriteServ("482 %s %s :You must be at least a half-operator to change the topic on this channel", user->nick, Ptr->name);
 					return CMD_FAILURE;