More tweaks

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

diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 6882c8d35d6f1d459169a9a05432240d54547184..006036145097c627b1f0294460808847817aa01d 100644 (file)
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -24,7 +24,7 @@
 #include "modules.h"
 #include "wildcard.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "commands/cmd_notice.h"
 
@@ -37,7 +37,7 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
        
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
-       if ((parameters[0][0] == '$') && ((*user->oper) || (is_uline(user->server))))
+       if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server))))
        {
                int MOD_RESULT = 0;
                 std::string temp = parameters[1];
@@ -118,7 +118,7 @@ void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user)
                }
                parameters[1] = (char*)temp.c_str();
 
-               if (dest->fd > -1)
+               if (IS_LOCAL(dest))
                {
                        // direct write, same server
                        user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]);