Some more to fix still, modules probably wont load correctly atm

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

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index d07a96fb70148f3c9af1b9df0930e439cb0f73cb..13a9b0c908de1bc90daff7c6c41e6d220da1c859 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -12,27 +12,25 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
 
 /** Handle /SAPART
  */
-class cmd_sapart : public command_t
+class CommandSapart : public Command
 {
  public:
-       cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2)
+       CommandSapart (InspIRCd* Instance) : Command(Instance,"SAPART", 'o', 2, false, 0)
        {
                this->source = "m_sapart.so";
                syntax = "<nick> <channel>";
+               TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
-               chanrec* channel = ServerInstance->FindChan(parameters[1]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               Channel* channel = ServerInstance->FindChan(parameters[1]);
                if (dest && channel)
                {
                        if (ServerInstance->ULine(dest->server))
@@ -49,7 +47,7 @@ class cmd_sapart : public command_t
                        {
                                if (!channel->PartUser(dest, dest->nick))
                                        delete channel;
-                               chanrec* n = ServerInstance->FindChan(parameters[1]);
+                               Channel* n = ServerInstance->FindChan(parameters[1]);
                                if (!n)
                                {
                                        ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]);
@@ -88,14 +86,15 @@ class cmd_sapart : public command_t
 
 class ModuleSapart : public Module
 {
-       cmd_sapart*     mycommand;
+       CommandSapart*  mycommand;
  public:
        ModuleSapart(InspIRCd* Me)
                : Module(Me)
        {
                
-               mycommand = new cmd_sapart(ServerInstance);
+               mycommand = new CommandSapart(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleSapart()
@@ -104,10 +103,10 @@ class ModuleSapart : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-MODULE_INIT(ModuleSapart);
+MODULE_INIT(ModuleSapart)