diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/proto.h | 3 | ||||
| -rw-r--r-- | include/pttstruct.h | 4 | ||||
| -rw-r--r-- | include/uflags.h | 18 |
3 files changed, 12 insertions, 13 deletions
diff --git a/include/proto.h b/include/proto.h index f324d338..b46b8b0d 100644 --- a/include/proto.h +++ b/include/proto.h @@ -663,9 +663,6 @@ int query_online(const char *userid); int t_changeangel(void); int t_angelmsg(void); void CallAngel(void); -void SwitchBeingAngel(void); -void SwitchAngelSex(int); -int t_switchangel(void); #endif /* tmpjack */ diff --git a/include/pttstruct.h b/include/pttstruct.h index 4e8f6983..cc766a40 100644 --- a/include/pttstruct.h +++ b/include/pttstruct.h @@ -310,14 +310,14 @@ typedef struct userinfo_t { char from[27]; /* machine name the user called in from */ int from_alias; char sex; - char nonuse[4]; + char nonuse[5]; /* unsigned char goodpost; unsigned char badpost; unsigned char goodsale; unsigned char badsale; + unsigned char angel; // deprecated: angel reject status */ - unsigned char angel; /* friends */ int friendtotal; /* 好友比較的cache 大小 */ diff --git a/include/uflags.h b/include/uflags.h index dcc4c84e..8ab31e09 100644 --- a/include/uflags.h +++ b/include/uflags.h @@ -68,15 +68,17 @@ #define REJ_OUTTAMAIL 0x00000400 /* true if don't accept outside mails */ #define REJECT_OUTTAMAIL (cuser.uflag2 & REJ_OUTTAMAIL) -/* ANGEL */ -#define REJ_QUESTION 0x00000800 /* true if don't want to be angel for a while */ -#define ANGEL_R_MAEL 0x00001000 /* true if reject male */ -#define ANGEL_R_FEMAEL 0x00002000 /* true if reject female */ -#define ANGEL_MASK 0x00003000 -#define REJECT_QUESTION (cuser.uflag2 & REJ_QUESTION) -#define ANGEL_STATUS() ((cuser.uflag2 & ANGEL_MASK) >> 12) -#define ANGEL_SET(X) (cuser.uflag2 = (cuser.uflag2 & ~ANGEL_MASK) | \ +/* ANGEL [deprecated] */ +// #define REJ_QUESTION 0x00000800 /* true if don't want to be angel for a while */ // deprecated +// #define ANGEL_R_MAEL 0x00001000 /* true if reject male */ // deprecated +// #define ANGEL_R_FEMAEL 0x00002000 /* true if reject female */ // deprecated +// #define ANGEL_MASK 0x00003000 +// #define REJECT_QUESTION (cuser.uflag2 & REJ_QUESTION) // deprecated +// #define ANGEL_STATUS() ((cuser.uflag2 & ANGEL_MASK) >> 12) +/* + #define ANGEL_SET(X) (cuser.uflag2 = (cuser.uflag2 & ~ANGEL_MASK) | \ (((X) & 3) << 12)) + */ // #define ANGEL_??? 0x00004000 // #define ANGEL_??? 0x00008000 |