Remove CHFL_DEOPPED entirely.

Since charybdis 2.3 will require TS6, emulating legacy semantics is
unnecessary.

diff --git a/include/channel.h b/include/channel.h
index 3363fb72596ad8be8d7a6d28008c8946925f8964..5276224f64e4c493f30e39020379848e7f8ed2a9 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -147,7 +147,6 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define CHFL_PEON              0x0000  /* normal member of channel */
 #define CHFL_CHANOP            0x0001  /* Channel operator */
 #define CHFL_VOICE             0x0002  /* the power to speak */
-#define CHFL_DEOPPED           0x0004  /* deopped on sjoin, bounce modes */
 #define CHFL_BANNED            0x0008  /* cached as banned */
 #define CHFL_QUIETED           0x0010  /* cached as being +q victim */
 #define ONLY_SERVERS           0x0020
@@ -158,7 +157,6 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define is_chanop(x)   ((x) && (x)->flags & CHFL_CHANOP)
 #define is_voiced(x)   ((x) && (x)->flags & CHFL_VOICE)
 #define is_chanop_voiced(x) ((x) && (x)->flags & (CHFL_CHANOP|CHFL_VOICE))
-#define is_deop(x)     ((x) && (x)->flags & CHFL_DEOPPED)
 #define can_send_banned(x) ((x) && (x)->flags & (CHFL_BANNED|CHFL_QUIETED))
 
 /* channel modes ONLY */

diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index f59a950a8eba0ccf5a9af3ed67189b59ee90628e..4867e4498e567efe4e35a3b13d3a0aa7fc1c75c5 100644 (file)
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -136,9 +136,6 @@ m_mode(struct Client *client_p, struct Client *source_p, int parc, const char *p
        {
                msptr = find_channel_membership(chptr, source_p);
 
-               if(is_deop(msptr))
-                       return 0;
-
                /* Finish the flood grace period... */
                if(MyClient(source_p) && !IsFloodDone(source_p))
                {

diff --git a/modules/core/m_sjoin.c b/modules/core/m_sjoin.c
index b9c60dc034eda769f5b25451551d3dc62dd11847..fc65db27cb8044a28a28dbfeb8bed3a2f96b5f19 100644 (file)
--- a/modules/core/m_sjoin.c
+++ b/modules/core/m_sjoin.c
@@ -463,12 +463,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
                len_uid += len;
 
                if(!keep_new_modes)
-               {
-                       if(fl & CHFL_CHANOP)
-                               fl = CHFL_DEOPPED;
-                       else
-                               fl = 0;
-               }
+                       fl = 0;
 
                if(!IsMember(target_p, chptr))
                {

diff --git a/src/chmode.c b/src/chmode.c
index a45daa754fbb09f91f3bb4fff40ba8bea4af32bc..4e733bc420b1c7f17628e476858faf203bc97a55 100644 (file)
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -738,7 +738,6 @@ chm_op(struct Client *source_p, struct Channel *chptr,
                mode_changes[mode_count++].client = targ_p;
 
                mstptr->flags |= CHFL_CHANOP;
-               mstptr->flags &= ~CHFL_DEOPPED;
        }
        else
        {