9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove CHFL_DEOPPED entirely.

Browse source 
Since charybdis 2.3 will require TS6, emulating legacy semantics is
unnecessary.
This commit is contained in:
William Pitcock 2008-02-27 14:08:27 -06:00
parent 81daf9555b
commit aed5ce90a5
4 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/channel.h
View file

@ -147,7 +147,6 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
#define CHFL_PEON 0x0000 /* normal member of channel */ #define CHFL_PEON 0x0000 /* normal member of channel */
#define CHFL_CHANOP 0x0001 /* Channel operator */ #define CHFL_CHANOP 0x0001 /* Channel operator */
#define CHFL_VOICE 0x0002 /* the power to speak */ #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_BANNED 0x0008 /* cached as banned */
#define CHFL_QUIETED 0x0010 /* cached as being +q victim */ #define CHFL_QUIETED 0x0010 /* cached as being +q victim */
#define ONLY_SERVERS 0x0020 #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_chanop(x) ((x) && (x)->flags & CHFL_CHANOP)
#define is_voiced(x) ((x) && (x)->flags & CHFL_VOICE) #define is_voiced(x) ((x) && (x)->flags & CHFL_VOICE)
#define is_chanop_voiced(x) ((x) && (x)->flags & (CHFL_CHANOP|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)) #define can_send_banned(x) ((x) && (x)->flags & (CHFL_BANNED|CHFL_QUIETED))
/* channel modes ONLY */ /* channel modes ONLY */

3
modules/core/m_mode.c
View file

@ -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); msptr = find_channel_membership(chptr, source_p);
if(is_deop(msptr))
return 0;
/* Finish the flood grace period... */ /* Finish the flood grace period... */
if(MyClient(source_p) && !IsFloodDone(source_p)) if(MyClient(source_p) && !IsFloodDone(source_p))
{ {

5
modules/core/m_sjoin.c
View file

@ -463,12 +463,7 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
len_uid += len; len_uid += len;
if(!keep_new_modes) if(!keep_new_modes)
{
if(fl & CHFL_CHANOP)
fl = CHFL_DEOPPED;
else
fl = 0; fl = 0;
}
if(!IsMember(target_p, chptr)) if(!IsMember(target_p, chptr))
{ {

1
src/chmode.c
View file

@ -738,7 +738,6 @@ chm_op(struct Client *source_p, struct Channel *chptr,
mode_changes[mode_count++].client = targ_p; mode_changes[mode_count++].client = targ_p;
mstptr->flags |= CHFL_CHANOP; mstptr->flags |= CHFL_CHANOP;
mstptr->flags &= ~CHFL_DEOPPED;
} }
else else
{ {