Remove CHFL_DEOPPED entirely.
Since charybdis 2.3 will require TS6, emulating legacy semantics is unnecessary.
This commit is contained in:
parent
c240ecad4f
commit
fda6c724ea
|
@ -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 */
|
||||
|
|
|
@ -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))
|
||||
{
|
||||
|
|
|
@ -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))
|
||||
{
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue