Fix for bug #415, affects only trunk (wish i'd known this before i started!)

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

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 166d1bcc44c3fdea69a984d2721b51319425c3c4..a054a00ef879f0c9312e91bd87f5d70e12f959ba 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */
@@ -54,7 +51,7 @@ class ModuleAuditorium : public Module
        CUList except_list;
  public:
        ModuleAuditorium(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                aum = new AuditoriumMode(ServerInstance);
                if (!ServerInstance->AddMode(aum, 'u'))
@@ -77,7 +74,7 @@ class ModuleAuditorium : public Module
        Priority Prioritize()
        {
                /* To ensure that we get priority over namesx for names list generation on +u channels */
-               return (Priority)ServerInstance->PriorityBefore("m_namesx.so");
+               return (Priority)ServerInstance->Modules->PriorityBefore("m_namesx.so");
        }
 
        virtual Version GetVersion()
@@ -114,7 +111,7 @@ class ModuleAuditorium : public Module
                        else
                        {
                                /* HELLOOO, IS ANYBODY THERE? -- nope, just us. */
-                               user->WriteServ("353 %s = %s :%s", user->nick, Ptr->name, user->nick);
+                               user->WriteServ("353 %s %c %s :%s", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name, user->nick);
                                user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
                                return 1;
                        }
@@ -188,26 +185,4 @@ class ModuleAuditorium : public Module
        }
 };
 
-class ModuleAuditoriumFactory : public ModuleFactory
-{
- public:
-       ModuleAuditoriumFactory()
-       {
-       }
-       
-       ~ModuleAuditoriumFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAuditorium(Me);
-       }
-       
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleAuditoriumFactory;
-}
-
+MODULE_INIT(ModuleAuditorium)