m_spanningtree Replace #defines with references in DoCollision()

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

diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp
index d063176743548427129d96778382925c7f414623..dbf0003bf6fa5f8f373c551005bbcb026b68a3bb 100644 (file)
--- a/src/modules/m_spanningtree/addline.cpp
+++ b/src/modules/m_spanningtree/addline.cpp
@@ -42,7 +42,7 @@ CmdResult CommandAddLine::Handle(User* usr, std::vector<std::string>& params)
        }
        catch (ModuleException &e)
        {
-               ServerInstance->SNO->WriteToSnoMask('d',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason());
+               ServerInstance->SNO->WriteToSnoMask('d',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str());
                return CMD_FAILURE;
        }
        xl->SetCreateTime(ConvToInt(params[3]));
@@ -50,7 +50,7 @@ CmdResult CommandAddLine::Handle(User* usr, std::vector<std::string>& params)
        {
                if (xl->duration)
                {
-                       std::string timestr = ServerInstance->TimeString(xl->expiry);
+                       std::string timestr = InspIRCd::TimeString(xl->expiry);
                        ServerInstance->SNO->WriteToSnoMask('X',"%s added %s%s on %s to expire on %s: %s",setter.c_str(),params[0].c_str(),params[0].length() == 1 ? "-line" : "",
                                        params[1].c_str(), timestr.c_str(), params[5].c_str());
                }
@@ -60,7 +60,7 @@ CmdResult CommandAddLine::Handle(User* usr, std::vector<std::string>& params)
                                        params[1].c_str(),params[5].c_str());
                }
 
-               TreeServer* remoteserver = Utils->FindServer(usr->server);
+               TreeServer* remoteserver = TreeServer::Get(usr);
 
                if (!remoteserver->bursting)
                {