Patch by dz avoiding <badchan:redirect> loops, and tidying up on-rehash checks.

[user/henk/code/inspircd.git] / include / mode.h

diff --git a/include/mode.h b/include/mode.h
index eda18a528e6786beb2182f78fbde7d894f9db750..8faea3491c821046502d11d7dffb6b6fb085eb31 100644 (file)
--- a/include/mode.h
+++ b/include/mode.h
@@ -14,13 +14,6 @@
 #ifndef __MODE_H
 #define __MODE_H
 
-#include <string>
-#include <deque>
-#include <vector>
-#include "ctables.h"
-
-class InspIRCd;
-
 /**
  * Holds the values for different type of modes
  * that can exist, USER or CHANNEL type.
@@ -141,6 +134,11 @@ class CoreExport ModeHandler : public Extensible
         */
        unsigned int count;
 
+       /** The prefix char needed on channel to use this mode,
+        * only checked for channel modes
+        */
+       char prefixneeded;
+
  public:
        /**
         * The constructor for ModeHandler initalizes the mode handler.
@@ -158,7 +156,7 @@ class CoreExport ModeHandler : public Extensible
         * and the rank values OP_VALUE, HALFOP_VALUE and VOICE_VALUE respectively. Any prefixes you define should have unique values proportional
         * to these three defaults or proportional to another mode in a module you depend on. See src/cmode_o.cpp as an example.
         */
-       ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix = 0);
+       ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix = 0, char prefixrequired = '%');
        /**
         * The default destructor does nothing
         */
@@ -284,6 +282,10 @@ class CoreExport ModeHandler : public Extensible
         * @param channel The channel which the server wants to remove your mode from
         */
        virtual void RemoveMode(Channel* channel);
+
+       char GetNeededPrefix();
+
+       void SetNeededPrefix(char needsprefix);
 };
 
 /**