AMD64 warning 'fix' which tested fine when I added it seems to now...stop things...

[user/henk/code/inspircd.git] / src / modules / m_knock.cpp

diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index bd6049718b064dca9f93f35f1d282a1c8b1e4796..9169cfd4cb0a93391b55f94651ec37da166fd0b0 100644 (file)
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -25,7 +25,7 @@ using namespace std;
 
 /* $ModDesc: Provides support for /KNOCK and mode +K */
 
-Server *Srv;
+static Server *Srv;
 
 class cmd_knock : public command_t
 {
@@ -40,18 +40,19 @@ class cmd_knock : public command_t
                chanrec* c = Srv->FindChannel(parameters[0]);
                std::string line = "";
 
+               if (c->IsModeSet('K'))
+               {
+                       WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
+                       return;
+               }
+
                for (int i = 1; i < pcnt - 1; i++)
                {
                        line = line + std::string(parameters[i]) + " ";
                }
                line = line + std::string(parameters[pcnt-1]);
 
-               if (c->IsCustomModeSet('K'))
-               {
-                       WriteServ(user->fd,"480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name);
-                       return;
-               }
-               if (c->binarymodes & CM_INVITEONLY)
+               if (c->modes[CM_INVITEONLY])
                {
                        WriteChannelWithServ((char*)Srv->GetServerName().c_str(),c,"NOTICE %s :User %s is KNOCKing on %s (%s)",c->name,user->nick,c->name,line.c_str());
                        WriteServ(user->fd,"NOTICE %s :KNOCKing on %s",user->nick,c->name);