More prefixchar stuff.

WARNING: 005 numeric is broken in this commit.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5000 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 6 insertions, 20 deletions

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 1ee4742a3..0d66f0202 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -126,8 +126,8 @@ class RemoveBase
 		}
 		else
 		{
-			ServerInstance->Log(DEBUG, "Setting ulevel to %s", channel->GetStatusChar(user));
-			ulevel = chartolevel(channel->GetStatusChar(user));
+			ServerInstance->Log(DEBUG, "Setting ulevel to %s", channel->GetPrefixChar(user));
+			ulevel = chartolevel(channel->GetPrefixChar(user));
 		}
 			
 		/* Now it's the same idea, except for the target. If they're ulined make sure they get a higher level than the sender can */
@@ -148,8 +148,8 @@ class RemoveBase
 		}
 		else
 		{
-			ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetStatusChar(target));
-			tlevel = chartolevel(channel->GetStatusChar(target));
+			ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetPrefixChar(target));
+			tlevel = chartolevel(channel->GetPrefixChar(target));
 		}
 		
 		hasnokicks = (ServerInstance->FindModule("m_nokicks.so") && channel->IsModeSet('Q'));
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index abd07d170..4f3645026 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -1613,22 +1613,8 @@ class TreeSocket : public InspSocket
 				specific_voice.push_back(i->second);
 			}
 
-			const char* n = "";
-			if (x & UCMODE_OP)
-			{
-				n = "@";
-			}
-			else if (x & UCMODE_HOP)
-			{
-				n = "%";
-			}
-			else if (x & UCMODE_VOICE)
-			{
-				n = "+";
-			}
-
 			// The first parameter gets a : before it
-			size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s%s", !numusers ? ":" : "", n, i->second->nick);
+			size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s%s", !numusers ? ":" : "", c->GetPrefixChar(i->second), i->second->nick);
 
 			curlen += ptrlen;
 			ptr += ptrlen;
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 55b3a650c..410d9b732 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -57,7 +57,7 @@ void spy_userlist(userrec *user,chanrec *c)
 	CUList *ulist= c->GetUsers();
 	for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 	{
-		strlcat(list,c->GetStatusChar(i->second),MAXBUF);
+		strlcat(list,c->GetPrefixChar(i->second),MAXBUF);
 		strlcat(list,i->second->nick,MAXBUF);
 		strlcat(list," ",MAXBUF);
 		if (strlen(list)>(480-NICKMAX))