Removal of ancient TRUE/FALSE #defines (C-ish stuff)

[user/henk/code/inspircd.git] / src / cmd_topic.cpp

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index cb852dabc51846f638430ac4c60a90c1744f6cc7..b8c60240dc5ade2abe2a1ee55c2f8e4438209e33 100644 (file)
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -57,7 +57,6 @@ extern std::vector<ircd_module*> factory;
 extern time_t TIME;
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern std::vector<userrec*> all_opers;
 extern std::vector<userrec*> local_users;
 extern userrec* fd_ref_table[MAX_DESCRIPTORS];
@@ -71,7 +70,7 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
                Ptr = FindChan(parameters[0]);
                if (Ptr)
                {
-                       if (((Ptr) && (!has_channel(user,Ptr))) && (Ptr->binarymodes & CM_SECRET))
+                       if ((Ptr->modes[CM_SECRET]) && (!Ptr->HasUser(user)))
                        {
                                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, Ptr->name);
                                return;
@@ -99,12 +98,12 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
                {
                        if (IS_LOCAL(user))
                        {
-                               if ((Ptr) && (!has_channel(user,Ptr)))
+                               if (!Ptr->HasUser(user))
                                {
                                        WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, Ptr->name);
                                        return;
                                }
-                               if ((Ptr->binarymodes & CM_TOPICLOCK) && (cstatus(user,Ptr)<STATUS_HOP))
+                               if ((Ptr->modes[CM_TOPICLOCK]) && (cstatus(user,Ptr)<STATUS_HOP))
                                {
                                        WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel", user->nick, Ptr->name);
                                        return;