cmode(), cflags(), cstatus() -> chanrec::GetStatusChar(), chanrec::GetStatusFlags...

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

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 21209ab6a45f4e85c13ad672de380d010b089a85..19a21717802a88afeda6984629427df772d0d553 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -228,7 +228,7 @@ class TreeServer : public classbase
                ServerDesc = "";
                VersionString = "";
                UserCount = OperCount = 0;
-               VersionString = Srv->GetVersion();
+               VersionString = ServerInstance->GetVersionString();
        }
 
        /* We use this constructor only to create the 'root' item, TreeRoot, which
@@ -240,7 +240,7 @@ class TreeServer : public classbase
                Parent = NULL;
                VersionString = "";
                UserCount = OperCount = 0;
-               VersionString = Srv->GetVersion();
+               VersionString = ServerInstance->GetVersionString();
                Route = NULL;
                Socket = NULL; /* Fix by brain */
                AddHashEntry();
@@ -1616,7 +1616,7 @@ class TreeSocket : public InspSocket
 
                for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                {
-                       int x = cflags(i->second,c);
+                       int x = c->GetStatusFlags(i->second);
                        if ((x & UCMODE_HOP) && (x & UCMODE_OP))
                        {
                                specific_halfop.push_back(i->second);
@@ -1817,7 +1817,7 @@ class TreeSocket : public InspSocket
                ServerInstance->WriteOpers("*** Bursting to \2"+name+"\2.");
                this->WriteLine(burst);
                /* send our version string */
-               this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+Srv->GetVersion());
+               this->WriteLine(":"+Srv->GetServerName()+" VERSION :"+this->Instance->GetVersionString());
                /* Send server tree */
                this->SendServers(TreeRoot,s,1);
                /* Send users and their oper status */