From 458be36a321615c0f3004a6abde7e14d40f5da32 Mon Sep 17 00:00:00 2001 From: Adam- Date: Sun, 8 Nov 2009 20:06:21 +0000 Subject: Rewrote all of the old C style flag systems into a new Flag class which everything inherits from. This breaks reading and writing flags to the old databases (and probably many other things aswell) - Don't use it git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2636 5417fbe8-f217-4b02-8779-1006273d7864 --- include/extern.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'include/extern.h') diff --git a/include/extern.h b/include/extern.h index 821bc2190..21a4987ff 100644 --- a/include/extern.h +++ b/include/extern.h @@ -123,7 +123,7 @@ E Entry *elist_find_mask(EList *list, const char *mask); E long get_memuse(EList *list); -#define whosends(ci) ((!(ci) || !((ci)->botflags & BS_SYMBIOSIS) || !(ci)->bi || !(ci)->c || (ci)->c->usercount < BSMinUsers) ? findbot(s_ChanServ) : (ci)->bi) +#define whosends(ci) ((!(ci) || !((ci)->botflags.HasFlag(BS_SYMBIOSIS)) || !(ci)->bi || !(ci)->c || (ci)->c->usercount < BSMinUsers) ? findbot(s_ChanServ) : (ci)->bi) /**** chanserv.c ****/ @@ -257,7 +257,7 @@ E bool RestrictMail; E time_t MailDelay; E bool DontQuoteAddresses; -E int NSDefFlags; +E Flags NSDefFlags; E unsigned NSDefLanguage; E time_t NSRegDelay; E time_t NSResendDelay; @@ -280,7 +280,7 @@ E bool NSEmailReg; E bool NSModeOnID; E bool NSAddAccessOnReg; -E int CSDefFlags; +E Flags CSDefFlags; E unsigned CSMaxReg; E time_t CSExpire; E int CSDefBantype; @@ -298,7 +298,7 @@ E time_t MSSendDelay; E bool MSNotifyAll; E unsigned MSMemoReceipt; -E int BSDefFlags; +E Flags BSDefFlags; E time_t BSKeepData; E unsigned BSMinUsers; E unsigned BSBadWordsMax; @@ -720,14 +720,13 @@ E Server *serv_uplink; E uint32 uplink_capab; E CapabInfo capab_info[]; -E Server *first_server(int flags); -E Server *next_server(int flags); +E Server *first_server(ServerFlag flag); +E Server *next_server(ServerFlag flag); E int is_ulined(const char *server); E int is_sync(Server *server); -E Server *new_server(Server * uplink, const char *name, const char *desc, - uint16 flags, const char *suid); +E Server *new_server(Server * uplink, const char *name, const char *desc, ServerFlag flag, const char *suid); E Server *findserver(Server *s, const char *name); -- cgit