Automated merge with ssh://shadowircd/uranium/shadowircd/

[irc/rqf/shadowircd.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index 164abe511472a500d29a59eb649da541df36c67d..1cbcb1df63a49bd40e3ee73816bc1fccec9b1cf6 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -114,6 +114,7 @@ struct ChModeChange
        int caps;
        int nocaps;
        int mems;
+       int override;
        struct Client *client;
 };
 
@@ -149,6 +150,7 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define ONLY_SERVERS           0x0020
 #define CHFL_HALFOP            0x0040
 #define CHFL_OWNER             0x0080
+#define        ONLY_OPERS              0x0100
 #define ALL_MEMBERS            CHFL_PEON
 #define ONLY_CHANOPS           CHFL_CHANOP
 #define ONLY_CHANOPSVOICED     (CHFL_CHANOP|CHFL_VOICE)
@@ -175,13 +177,14 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define MODE_FREETARGET 0x1000  /* can be forwarded to without authorization */
 #define MODE_DISFORWARD 0x2000  /* disable channel forwarding */
 #define MODE_NOCTCP     0x8000  /* Block CTCPs directed to this channel */
-#define MODE_NONOTICE  0x16000 /* Block notices directed to this channel */
-#define MODE_NOACTION  0x32000 /* Block CTCP ACTION directed to this channel */
-#define MODE_NOKICK    0x64000 /* Disable /kick on this channel */
-#define MODE_NONICK    0x128000 /* Disable /nick for anyone on this channel */
-#define MODE_NOCAPS    0x256000 /* Block messages in all capital letters */
-#define MODE_NOREJOIN  0x512000 /* Block rejoin immediately after kick */
-#define MODE_NOREPEAT  0x1024000 /* Block repeat messages */
+#define MODE_NONOTICE  0x10000 /* Block notices directed to this channel */
+#define MODE_NOACTION  0x20000 /* Block CTCP ACTION directed to this channel */
+#define MODE_NOKICK    0x40000 /* Disable /kick on this channel */
+#define MODE_NONICK    0x80000 /* Disable /nick for anyone on this channel */
+#define MODE_NOCAPS    0x100000 /* Block messages in all capital letters */
+#define MODE_NOREJOIN  0x200000 /* Block rejoin immediately after kick */
+#define MODE_NOREPEAT  0x400000 /* Block repeat messages */
+#define MODE_NOOPERKICK        0x800000 /* disallow kicking opers */
 
 #define CHFL_BAN        0x10000000     /* ban channel flag */
 #define CHFL_EXCEPTION  0x20000000     /* exception to ban channel flag */