More (last of extra)

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

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index e68d3f76098450245a39a727a435552983d5a586..e19cf76524c185131c5b2adb745d927a4b083766 100644 (file)
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -11,11 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "configreader.h"
-#include "inspircd.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides support for unreal-style oper-override */
@@ -33,7 +33,7 @@ class ModuleOverride : public Module
  public:
  
        ModuleOverride(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {               
                // read our config options (main config file)
                OnRehash(NULL,"");
@@ -107,7 +107,7 @@ class ModuleOverride : public Module
 
        virtual int OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason)
        {
-               if ((*source->oper) && (CanOverride(source,"KICK")))
+               if (IS_OPER(source) && CanOverride(source,"KICK"))
                {
                        if (((chan->GetStatus(source) == STATUS_HOP) && (chan->GetStatus(user) == STATUS_OP)) || (chan->GetStatus(source) < STATUS_VOICE))
                        {
@@ -121,7 +121,7 @@ class ModuleOverride : public Module
        
        virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
        {
-               if (*source->oper)
+               if (IS_OPER(source))
                {
                        if (source && channel)
                        {
@@ -232,7 +232,7 @@ class ModuleOverride : public Module
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
-               if (*user->oper)
+               if (IS_OPER(user))
                {
                        if (chan)
                        {
@@ -311,7 +311,7 @@ class ModuleOverrideFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleOverrideFactory;
 }