This works, not sure why. Someone find out why we cant use && !isock->HasResult(...

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

diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index 9874936d82c9fe203c2bf2c470fb865e4c6437dc..b02f9a391267c77e59b9f3543ced5ac6e340bc65 100644 (file)
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Prevents users who's nicks are not registered from creating new channels */
@@ -22,7 +19,7 @@ class ModuleRegOnlyCreate : public Module
 {
  public:
        ModuleRegOnlyCreate(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
        }
 
@@ -31,7 +28,7 @@ class ModuleRegOnlyCreate : public Module
                List[I_OnUserPreJoin] = 1;
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
        {
                if (chan)
                        return 0;
@@ -48,7 +45,7 @@ class ModuleRegOnlyCreate : public Module
                return 0;
        }
        
-       virtual ~ModuleRegOnlyCreate()
+       virtual ~ModuleRegOnlyCreate()
        {
        }
        
@@ -58,28 +55,4 @@ class ModuleRegOnlyCreate : public Module
        }
 };
 
-
-class ModuleRegOnlyCreateFactory : public ModuleFactory
-{
- public:
-       ModuleRegOnlyCreateFactory()
-       {
-       }
-       
-       ~ModuleRegOnlyCreateFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleRegOnlyCreate(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRegOnlyCreateFactory;
-}
-
+MODULE_INIT(ModuleRegOnlyCreate)