Optimisation of optimisation :P ty w00tie

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

diff --git a/src/modules.cpp b/src/modules.cpp
index c562161e0a0b874f14a0027bc9b73d1c3591c08c..a267662dfdd0abd16d321f09cc7d7effa9620195 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -416,7 +416,7 @@ chanrec* Server::GetChannelIndex(long index)
 
 void Server::AddTimer(InspTimer* T)
 {
-       AddTimer(T);
+       ::AddTimer(T);
 }
 
 void Server::SendOpers(std::string s)
@@ -486,9 +486,9 @@ bool Server::IsUlined(std::string server)
        return is_uline(server.c_str());
 }
 
-void Server::CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user)
+bool Server::CallCommandHandler(std::string commandname, char** parameters, int pcnt, userrec* user)
 {
-       ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
+       return ServerInstance->Parser->CallHandler(commandname,parameters,pcnt,user);
 }
 
 bool Server::IsValidModuleCommand(std::string commandname, int pcnt, userrec* user)
@@ -535,7 +535,7 @@ void Server::SendTo(userrec* Source, userrec* Dest, std::string s)
        if (!Source)
        {
                // if source is NULL, then the message originates from the local server
-               Write(Dest->fd,":%s %s",this->GetServerName().c_str(),s.c_str());
+               WriteServ_NoFormat(Dest->fd,s.c_str());
        }
        else
        {