Remove some fake client stuff, make it use the global record

[user/henk/code/inspircd.git] / src / modes / cmode_v.cpp

diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 1c3c2352734ab671e9027914362cf15ed8c7410d..0ea887073392e22254e7291f4f921c26a55614c6 100644 (file)
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
 #include "inspircd.h"
+#include "configreader.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
@@ -50,21 +50,19 @@ void ModeChannelVoice::RemoveMode(chanrec* channel)
        CUList* list = channel->GetVoicedUsers();
        CUList copy;
        char moderemove[MAXBUF];
-       userrec* n = new userrec(ServerInstance);
-       n->SetFd(FD_MAGIC_NUMBER);
 
        for (CUList::iterator i = list->begin(); i != list->end(); i++)
        {
-               userrec* n = i->second;
-               copy.insert(std::make_pair(n,n));
+               userrec* n = i->first;
+               copy.insert(std::make_pair(n,n->nick));
        }
+
        for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
        {
                sprintf(moderemove,"-%c",this->GetModeChar());
-               const char* parameters[] = { channel->name, moderemove, i->second->nick };
-               ServerInstance->SendMode(parameters, 3, n);
+               const char* parameters[] = { channel->name, moderemove, i->first->nick };
+               ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
        }
-       delete n;
 }
 
 void ModeChannelVoice::RemoveMode(userrec* user)