summaryrefslogtreecommitdiff
path: root/src/channels.cpp
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-05-10 00:26:04 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-05-10 00:26:04 +0000
commitce533b67e6c58c02f25b2f26214ab9cd2c7c99b6 (patch)
tree8769edc2d2620441182585c14884d2456e8d5982 /src/channels.cpp
parentb8015b09dcf4b49ceb695b188a2172548378e1db (diff)
Small api change with wide reaching effects in modules - Allows modification of whats displayed by NAMES on a per-nick basis, so we can have UHNAMES in a seperate module to NAMESX (and possibly do some funky other stuff in the future too!)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6934 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 74c617538..93f0f790c 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -83,7 +83,7 @@ long chanrec::GetUserCounter()
void chanrec::AddUser(userrec* user)
{
- internal_userlist[user] = user;
+ internal_userlist[user] = user->nick;
}
unsigned long chanrec::DelUser(userrec* user)
@@ -109,7 +109,7 @@ bool chanrec::HasUser(userrec* user)
void chanrec::AddOppedUser(userrec* user)
{
- internal_op_userlist[user] = user;
+ internal_op_userlist[user] = user->nick;
}
void chanrec::DelOppedUser(userrec* user)
@@ -124,7 +124,7 @@ void chanrec::DelOppedUser(userrec* user)
void chanrec::AddHalfoppedUser(userrec* user)
{
- internal_halfop_userlist[user] = user;
+ internal_halfop_userlist[user] = user->nick;
}
void chanrec::DelHalfoppedUser(userrec* user)
@@ -139,7 +139,7 @@ void chanrec::DelHalfoppedUser(userrec* user)
void chanrec::AddVoicedUser(userrec* user)
{
- internal_voice_userlist[user] = user;
+ internal_voice_userlist[user] = user->nick;
}
void chanrec::DelVoicedUser(userrec* user)
@@ -622,8 +622,8 @@ void chanrec::WriteChannel(userrec* user, const std::string &text)
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (IS_LOCAL(i->second))
- i->second->Write(out);
+ if (IS_LOCAL(i->first))
+ i->first->Write(out);
}
}
@@ -652,8 +652,8 @@ void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (IS_LOCAL(i->second))
- i->second->Write(out);
+ if (IS_LOCAL(i->first))
+ i->first->Write(out);
}
}
@@ -715,12 +715,12 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((IS_LOCAL(i->second)) && (except_list.find(i->second) == except_list.end()))
+ if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end()))
{
if (serversource)
- i->second->WriteServ(text);
+ i->first->WriteServ(text);
else
- i->second->Write(out);
+ i->first->Write(out);
}
}
}
@@ -728,7 +728,7 @@ void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CULi
void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text)
{
CUList except_list;
- except_list[user] = user;
+ except_list[user] = user->nick;
this->WriteAllExcept(user, serversource, status, except_list, std::string(text));
}
@@ -742,7 +742,7 @@ int chanrec::CountInvisible()
CUList *ulist= this->GetUsers();
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (!(i->second->modes[UM_INVISIBLE]))
+ if (!(i->first->IsModeSet('i')))
count++;
}
@@ -831,7 +831,7 @@ void chanrec::UserList(userrec *user, CUList *ulist)
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((!has_user) && (i->second->modes[UM_INVISIBLE]))
+ if ((!has_user) && (i->first->modes[UM_INVISIBLE]))
{
/*
* user is +i, and source not on the channel, does not show
@@ -840,10 +840,10 @@ void chanrec::UserList(userrec *user, CUList *ulist)
continue;
}
- if (i->second->Visibility && !i->second->Visibility->VisibleTo(user))
+ if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
continue;
- size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick);
+ size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->first), i->second.c_str());
curlen += ptrlen;
ptr += ptrlen;