From fda6c724eab4723783dd1f98347aa18e5bd395ec Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@atheme.org>
Date: Wed, 27 Feb 2008 14:08:27 -0600
Subject: [PATCH] Remove CHFL_DEOPPED entirely. Since charybdis 2.3 will
 require TS6, emulating legacy semantics is unnecessary.

---
 include/channel.h      | 2 --
 modules/core/m_mode.c  | 3 ---
 modules/core/m_sjoin.c | 7 +------
 src/chmode.c           | 1 -
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/channel.h b/include/channel.h
index 3363fb7..5276224 100644
--- 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 f59a950..4867e44 100644
--- 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 b9c60dc..fc65db2 100644
--- 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 a45daa7..4e733bc 100644
--- 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
 	{