$! helpfile syntax for trigger, some cleanup

[irc/evilnet/x3.git] / src / chanserv.h

diff --git a/src/chanserv.h b/src/chanserv.h
index 6d1ce8f80b22b565729b26b185a85ec4f73fffbe..376161cd905d5a55f3869f8dc871c65ee4723687 100644 (file)
--- a/src/chanserv.h
+++ b/src/chanserv.h
@@ -24,11 +24,11 @@
 #include "nickserv.h"
 
 enum UL_ALIASES {
-    UL_PEON = 100,
+    UL_PEON = 1,
     UL_HALFOP = 150,
     UL_OP = 200,
     UL_MANAGER = 300,
-    UL_PRESENT = UL_MANAGER,
+    UL_PRESENT = UL_MANAGER, /* Level needed to keep the channel active */
     UL_COOWNER = 400,
     UL_OWNER = 500,
     UL_HELPER = 600,
@@ -55,7 +55,6 @@ enum charOption {
     chCTCPReaction,
     chBanTimeout,
     chResync,
-    chBanType,
     NUM_CHAR_OPTIONS
 };
 
@@ -122,12 +121,14 @@ struct chanData
 #define USER_SUSPENDED          0x00000002
 #define USER_AUTO_INVITE        0x00000004
 #define USER_AUTO_OP            0x00000008
-#define USER_FLAGS_SIZE         15
+#define USER_AUTO_JOIN          0x00000010
+#define USER_FLAGS_SIZE         25
 #define USER_FLAGS_DEFAULT      USER_AUTO_OP
 
 #define IsUserAutoOp(USER)      ((USER)->flags & USER_AUTO_OP)
 #define IsUserSuspended(USER)   ((USER)->flags & USER_SUSPENDED)
 #define IsUserAutoInvite(USER)  ((USER)->flags & USER_AUTO_INVITE)
+#define IsUserAutoJoin(USER)    ((USER)->flags & USER_AUTO_JOIN)
 
 struct userData
 {