extern time_t TIME -> InspIRCd::Time()

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index b0810a2e54ab4993fcd0d1034bc7b0f0d8a2952a..a7472bd95d9710fd648db59f2200b0dc676d4d30 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -28,12 +28,6 @@
 #include "hashcomp.h"
 #include "commands/cmd_nick.h"
 
-extern InspIRCd* ServerInstance;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-
 void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 {
        char oldnick[NICKMAX];
@@ -92,17 +86,17 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                }
                if (matches_qline(parameters[0]))
                {
-                       WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
+                       ServerInstance->WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
                        user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0]));
                        return;
                }
-               if ((Find(parameters[0])) && (Find(parameters[0]) != user))
+               if ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user))
                {
                        user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
                        return;
                }
        }
-       if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user)))
+       if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user)))
        {
                user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
                return;