4 files changed, 356 insertions, 317 deletions
diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index 36d04fc2..4bfb9e6f 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -14,7 +14,7 @@ NETOBJS  = mbbsd.o io.o term.o telnet.o
 TALKOBJS = talk.o chat.o friend.o
 UTILOBJS = stuff.o kaede.o convert.o name.o syspost.o
 PAGEROBJS= more.o pmore.o
-PLUGOBJS = lovepaper.o calendar.o topsong.o gamble.o vice.o
+PLUGOBJS = lovepaper.o calendar.o topsong.o gamble.o vice.o angel.o
 CHESSOBJS= chc.o chc_tab.o chess.o go.o gomo.o dark.o reversi.o
 GAMEOBJS = card.o guess.o chicken.o othello.o
 OBJS=	admin.o assess.o edit.o menu.o xyz.o var.o \
diff --git a/mbbsd/angel.c b/mbbsd/angel.c
new file mode 100644
index 00000000..6403b99b
--- /dev/null
+++ b/mbbsd/angel.c
@@ -0,0 +1,321 @@
+/* $Id$ */
+#include "bbs.h"
+
+// PTT-BBS Angel System
+
+#ifdef PLAY_ANGEL
+
+void 
+angel_toggle_pause()
+{
+    if (!HasUserPerm(PERM_ANGEL) || !currutmp)
+	return;
+    currutmp->angelpause ++;
+    currutmp->angelpause %= ANGELPAUSE_MODES;
+
+    // maintain deprecated value
+    cuser.uflag2 &= ~UF2_ANGEL_OLDMASK;
+}
+
+void 
+angel_load_data()
+{
+    // TODO cache angel.msg here.
+}
+
+int
+t_changeangel(){
+    char buf[4];
+
+    /* cuser.myangel == "-" means banned for calling angel */
+    if (cuser.myangel[0] == '-' || cuser.myangel[1] == 0) return 0;
+
+    getdata(b_lines - 1, 0,
+	    "�󴫤p�Ѩϫ�N�L�k���^�F��I �O�_�n�󴫤p�ѨϡH [y/N]",
+	    buf, 3, LCECHO);
+    if (buf[0] == 'y' || buf[0] == 'Y') {
+	char buf[100];
+	snprintf(buf, sizeof(buf), "%s�p�D�H %s ���� %s �p�Ѩ�\n",
+		ctime4(&now), cuser.userid, cuser.myangel);
+	buf[24] = ' '; // replace '\n'
+	log_file(BBSHOME "/log/changeangel.log", LOG_CREAT, buf);
+
+	cuser.myangel[0] = 0;
+	outs("�p�Ѩϧ�s�����A�U���I�s�ɷ|��X�s���p�Ѩ�");
+    }
+    return XEASY;
+}
+
+int 
+t_angelmsg(){
+    char msg[3][74] = { "", "", "" };
+    char nick[10] = "";
+    char buf[512];
+    int i;
+    FILE* fp;
+
+    setuserfile(buf, "angelmsg");
+    fp = fopen(buf, "r");
+    if (fp) {
+	i = 0;
+	if (fgets(msg[0], sizeof(msg[0]), fp)) {
+	    chomp(msg[0]);
+	    if (strncmp(msg[0], "%%[", 3) == 0) {
+		strlcpy(nick, msg[0] + 3, 7);
+		move(4, 0);
+		prints("�즳�ʺ١G%s�p�Ѩ�", nick);
+		msg[0][0] = 0;
+	    } else
+		i = 1;
+	} else
+	    msg[0][0] = 0;
+
+	move(5, 0);
+	outs("�즳�d���G\n");
+	if(msg[0][0])
+	    outs(msg[0]);
+	for (; i < 3; ++i) {
+	    if(fgets(msg[i], sizeof(msg[0]), fp)) {
+		outs(msg[i]);
+		chomp(msg[i]);
+	    } else
+		break;
+	}
+	fclose(fp);
+    }
+
+    getdata_buf(11, 0, "�p�Ѩϼʺ١G", nick, 7, 1);
+    do {
+	move(12, 0);
+	clrtobot();
+	outs("���b���ɭԭn��p�D�H������O�H"
+	     "�̦h�T��A��[Enter]����");
+	for (i = 0; i < 3 &&
+		getdata_buf(14 + i, 0, "�G", msg[i], sizeof(msg[i]), DOECHO);
+		++i);
+	getdata(b_lines - 2, 0, "(S)�x�s (E)���s�ӹL (Q)�����H[S]",
+		buf, 4, LCECHO);
+    } while (buf[0] == 'E' || buf[0] == 'e');
+    if (buf[0] == 'Q' || buf[0] == 'q')
+	return 0;
+    setuserfile(buf, "angelmsg");
+    if (msg[0][0] == 0)
+	unlink(buf);
+    else {
+	FILE* fp = fopen(buf, "w");
+	if(nick[0])
+	    fprintf(fp, "%%%%[%s\n", nick);
+	for (i = 0; i < 3 && msg[i][0]; ++i) {
+	    fputs(msg[i], fp);
+	    fputc('\n', fp);
+	}
+	fclose(fp);
+    }
+    return 0;
+}
+
+inline int
+angel_reject_me(userinfo_t * uin){
+    int* iter = uin->reject;
+    int unum;
+    while ((unum = *iter++)) {
+	if (unum == currutmp->uid) {
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+
+static int
+FindAngel(void){
+    int nAngel;
+    int i, j;
+    int choose;
+    int trial = 0;
+    int mask;
+
+    if (cuser.sex < 6) /* ���`�ʧO */
+	mask = 1 | (2 << (cuser.sex & 1));
+    else
+	mask = 7;
+
+    do{
+	nAngel = 0;
+	j = SHM->currsorted;
+	for (i = 0; i < SHM->UTMPnumber; ++i)
+	    if (SHM->uinfo[SHM->sorted[j][0][i]].userlevel & PERM_ANGEL)
+		++nAngel;
+
+	if (nAngel == 0)
+	    return 0;
+
+	choose = random() % nAngel + 1;
+	j = SHM->currsorted;
+	for (i = 0; i < SHM->UTMPnumber && choose; ++i)
+	    if (SHM->uinfo[SHM->sorted[j][0][i]].userlevel & PERM_ANGEL)
+		--choose;
+
+	if (choose == 0 && SHM->uinfo[SHM->sorted[j][0][i - 1]].uid != currutmp->uid
+		&& (SHM->uinfo[SHM->sorted[j][0][i - 1]].userlevel & PERM_ANGEL)
+		&& !angel_reject_me(&SHM->uinfo[SHM->sorted[j][0][i - 1]]) ){
+	    strlcpy(cuser.myangel, SHM->uinfo[SHM->sorted[j][0][i - 1]].userid, IDLEN + 1);
+	    passwd_update(usernum, &cuser);
+	    return 1;
+	}
+    }while(++trial < 5);
+    return 0;
+}
+
+static inline void
+GotoNewHand(){
+    char old_board[IDLEN + 1] = "";
+    int canRead = 1;
+
+    if (currutmp && currutmp->mode == EDITING)
+	return;
+
+    // usually crashed as 'assert(currbid == brc_currbid)'
+    if (currboard[0]) {
+	strlcpy(old_board, currboard, IDLEN + 1);
+	currboard = "";// force enter_board
+    }
+
+    if (enter_board(BN_NEWBIE) == 0)
+	canRead = 1;
+
+    if (canRead)
+	Read();
+
+    if (canRead && old_board[0])
+	enter_board(old_board);
+}
+
+
+static inline void
+NoAngelFound(const char* msg){
+    move(b_lines, 0);
+    outs(msg);
+    if (currutmp == NULL || currutmp->mode != EDITING)
+	outs("�A�Х��b�s��O�W�M�䵪�שΫ� Ctrl-P �o��");
+    clrtoeol();
+    refresh();
+    sleep(1);
+    GotoNewHand();
+    return;
+}
+
+static inline void
+AngelNotOnline(){
+    char buf[PATHLEN] = "";
+    const static char* const not_online_message = "�z���p�Ѩϲ{�b���b�u�W";
+
+    // TODO cache angel's nick name!
+
+    if (cuser.myangel[0] != '-')
+	sethomefile(buf, cuser.myangel, "angelmsg");
+    if (cuser.myangel[0] == '-' || !dashf(buf))
+	NoAngelFound(not_online_message);
+    else {
+	time4_t mod = dasht(buf);
+	FILE* fp = fopen(buf, "r");
+	clear();
+	showtitle("�p�Ѩϯd��", BBSNAME);
+	move(4, 0);
+	buf[0] = 0;
+	fgets(buf, sizeof(buf), fp);
+	if (strncmp(buf, "%%[", 3) == 0) {
+	    chomp(buf);
+	    prints("�z��%s�p�Ѩϲ{�b���b�u�W", buf + 3);
+	    fgets(buf, sizeof(buf), fp);
+	} else
+	    outs(not_online_message);
+
+	outs("\n͢�d�����A�G\n");
+	outs(ANSI_COLOR(1;31;44) "��s�w�w�w�w�w�w�w�w�w�w�w�w�w�w�t" ANSI_COLOR(37) ""
+	     "�p�Ѩϯd��" ANSI_COLOR(31) "�u�w�w�w�w�w�w�w�w�w�w�w�w�w�w�s��" ANSI_RESET "\n");
+	outs(ANSI_COLOR(1;31) "�~�t" ANSI_COLOR(32) " �p�Ѩ�                          "
+	     "                                     " ANSI_COLOR(31) "�u��" ANSI_RESET "\n");
+	do {
+	    chomp(buf);
+	    prints(ANSI_COLOR(1;31) "�x" ANSI_RESET "%-74.74s" ANSI_COLOR(1;31) "�x" ANSI_RESET "\n", buf);
+	} while (fgets(buf, sizeof(buf), fp));
+
+	outs(ANSI_COLOR(1;31) "���s�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w"
+		"�w�w�w�w�w�w�w�w�w�w�w�w�w�s��" ANSI_RESET "\n");
+	outs(ANSI_COLOR(1;31;44) "��r�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w"
+		"�w�w�w�w�w�w�w�w�w�w�w�w�w�w�r��" ANSI_RESET "\n");
+	prints("%55s%s", "�d�����: ", Cdatelite(&mod));
+
+
+	move(b_lines - 4, 0);
+	outs("�p�D�H�ϥΤW���D�䤣��p�ѨϽШ�s�⪩(" BN_NEWBIE ")\n"
+	     "              �Q�d�����p�ѨϽШ�\\�@��(AngelPray)\n"
+	     "                  �Q��ݪO�b�����ܥi��(AskBoard)\n"
+	     "�Х��b�U�O�W�M�䵪�שΫ� Ctrl-P �o��");
+	pressanykey();
+
+	GotoNewHand();
+    }
+}
+
+static void
+TalkToAngel(){
+    static int AngelPermChecked = 0;
+    userinfo_t* uent;
+    userec_t xuser;
+
+    if (strcmp(cuser.myangel, "-") == 0){
+	AngelNotOnline();
+	return;
+    }
+
+    if (cuser.myangel[0] && !AngelPermChecked) {
+	getuser(cuser.myangel, &xuser); // XXX if user doesn't exist
+	if (!(xuser.userlevel & PERM_ANGEL))
+	    cuser.myangel[0] = 0;
+    }
+    AngelPermChecked = 1;
+
+    if (cuser.myangel[0] == 0 && ! FindAngel()){
+	NoAngelFound("�{�b�S���p�ѨϦb�u�W");
+	return;
+    }
+
+    uent = search_ulist_userid(cuser.myangel);
+    if (uent == 0 || uent->angelpause || angel_reject_me(uent)){
+	AngelNotOnline();
+	return;
+    }
+
+    more("etc/angel_usage", NA);
+
+    /* �o�q�ܩγ\�i�H�b�p�ѨϦ^�����D�� show �X��
+    move(b_lines - 1, 0);
+    outs("�{�b�A��id����O�K�A�^���A���D���p�ѨϨä����D�A�O��       \n"
+         "�A�i�H��ܤ��V���z�S�ۤv�����ӫO�@�ۤv                   ");
+	 */
+
+    my_write(uent->pid, "�ݤp�ѨϡG ", "�p�Ѩ�", WATERBALL_ANGEL, uent);
+    return;
+}
+
+void
+CallAngel(){
+    static int      entered = 0;
+    screen_backup_t old_screen;
+
+    if (!HasUserPerm(PERM_LOGINOK) || entered)
+	return;
+    entered = 1;
+
+    scr_dump(&old_screen);
+
+    TalkToAngel();
+
+    scr_restore(&old_screen);
+
+    entered = 0;
+}
+
+#endif // PLAY_ANGEL
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 1a3cd5b9..013aca6b 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -224,18 +224,6 @@ set_friend_bit(const userinfo_t * me, const userinfo_t * ui)
     return hit;
 }
 
-inline int
-he_reject_me(userinfo_t * uin){
-    int* iter = uin->reject;
-    int unum;
-    while ((unum = *iter++)) {
-	if (unum == currutmp->uid) {
-	    return 1;
-	}
-    }
-    return 0;
-}
-
 int
 reverse_friend_stat(int stat)
 {
@@ -855,8 +843,9 @@ my_write(pid_t pid, const char *prompt, const char *id, int flag, userinfo_t * p
 #ifdef PLAY_ANGEL
 	    && flag != WATERBALL_ANGEL && flag != WATERBALL_CONFIRM_ANGEL) ||
 	    // check if user is changed of angelpause.
+	    // XXX if flag == WATERBALL_ANGEL, shuold be (uin->angelpause) only.
 	    ((flag == WATERBALL_ANGEL || flag == WATERBALL_CONFIRM_ANGEL)
-	     && (strcasecmp(cuser.myangel, uin->userid) || uin->angelpause)
+	     && (strcasecmp(cuser.myangel, uin->userid) || uin->angelpause >= ANGELPAUSE_REJALL)
 #endif
 	    )) {
 	bell();
@@ -904,7 +893,7 @@ my_write(pid_t pid, const char *prompt, const char *id, int flag, userinfo_t * p
 		 !(fri_stat & HFM))))
 #ifdef PLAY_ANGEL
 	       || ((flag == WATERBALL_ANGEL || flag == WATERBALL_CONFIRM_ANGEL)
-		   && he_reject_me(uin))
+		   && angel_reject_me(uin))
 #endif
 	       ) {
 	outmsg(ANSI_COLOR(1;33;41) "�V�|! ��訾���F! " ANSI_COLOR(37) "~>_<~" ANSI_RESET);
@@ -2330,18 +2319,23 @@ draw_pickup(int drawall, pickup_t * pickup, int pickup_way,
 #ifdef PLAY_ANGEL
 	if (HasUserPerm(PERM_ANGEL) && currutmp)
 	{
+	    // modes should match ANGELPAUSE*
+	    static const char *modestr[ANGELPAUSE_MODES] = {
+		ANSI_COLOR(1;30;47) "[���٩I�s��]" ANSI_COLOR(0;30;47)
+		    " �}�� " ANSI_RESET,
+		ANSI_COLOR(1;30;47) "[���٩I�s��]" ANSI_COLOR(0;32;47)
+		    " ���� " ANSI_RESET, 
+		ANSI_COLOR(1;30;47) "[���٩I�s��]" ANSI_COLOR(0;31;47)
+		    " ���� " ANSI_RESET, 
+	    };
 	    // reduced version
 	    outslr(	
 		ANSI_COLOR(34;46) " �𶢲�� "
 		ANSI_COLOR(31;47) " (TAB/f)" ANSI_COLOR(30) "�Ƨ�/�n�� " 
-		ANSI_COLOR(31) "(p)" ANSI_COLOR(30) "�����I�s�� " 
-		ANSI_COLOR(31) "(^P)" ANSI_COLOR(30) "�����ѨϪ��A ",
-		59,
-		currutmp->angelpause ?
-		ANSI_COLOR(1;30;47) "[���٩I�s��]" ANSI_COLOR(0;31;47)
-		" ���� " ANSI_RESET: 
-		ANSI_COLOR(1;30;47) "[���٩I�s��]" ANSI_COLOR(0;30;47)
-		" �}�� " ANSI_RESET,
+		ANSI_COLOR(31) "(p)" ANSI_COLOR(30) "�@��I�s�� " 
+		ANSI_COLOR(31) "(^P)" ANSI_COLOR(30) "���٩I�s�� ",
+		57,
+		modestr[currutmp->angelpause % ANGELPAUSE_MODES],
 		18);
 	} else 
 #endif
@@ -3011,11 +3005,15 @@ userlist(void)
 #ifdef PLAY_ANGEL
 	    case Ctrl('P'):
 		if (HasUserPerm(PERM_ANGEL) && currutmp) {
-		    currutmp->angelpause = !currutmp->angelpause;
-		    bell();
-		    vmsg(currutmp->angelpause ?
-			    " ������p�D�H�����D | �� | " :
-			    " �}�l�����p�D�H�o�� | �� | ");
+		    /*
+		    static const char *msgs[ANGELPAUSE_MODES] = {
+			" �����Ҧ��p�D�H�o�� [��] ",
+			" �u�����w�o�ݪ��p�D�H�����D [��] ",
+			" ������Ҧ��p�D�H�����D [��] ",
+		    };
+		    */
+		    angel_toggle_pause();
+		    // vmsg(msgs[currutmp->angelpause]);
 		    redrawall = redraw = 1;
 		}
 		break;
@@ -3395,287 +3393,3 @@ talkreply(void)
     currstat = currstat0;
 }
 
-#ifdef PLAY_ANGEL
-/* �p�ѨϤp�D�H�B�z�禡 */
-int
-t_changeangel(){
-    char buf[4];
-
-    /* cuser.myangel == "-" means banned for calling angel */
-    if (cuser.myangel[0] == '-' || cuser.myangel[1] == 0) return 0;
-
-    getdata(b_lines - 1, 0,
-	    "�󴫤p�Ѩϫ�N�L�k���^�F��I �O�_�n�󴫤p�ѨϡH [y/N]",
-	    buf, 3, LCECHO);
-    if (buf[0] == 'y' || buf[0] == 'Y') {
-	char buf[100];
-	snprintf(buf, sizeof(buf), "%s�p�D�H %s ���� %s �p�Ѩ�\n",
-		ctime4(&now), cuser.userid, cuser.myangel);
-	buf[24] = ' '; // replace '\n'
-	log_file(BBSHOME "/log/changeangel.log", LOG_CREAT, buf);
-
-	cuser.myangel[0] = 0;
-	outs("�p�Ѩϧ�s�����A�U���I�s�ɷ|��X�s���p�Ѩ�");
-    }
-    return XEASY;
-}
-
-int t_angelmsg(){
-    char msg[3][74] = { "", "", "" };
-    char nick[10] = "";
-    char buf[512];
-    int i;
-    FILE* fp;
-
-    setuserfile(buf, "angelmsg");
-    fp = fopen(buf, "r");
-    if (fp) {
-	i = 0;
-	if (fgets(msg[0], sizeof(msg[0]), fp)) {
-	    chomp(msg[0]);
-	    if (strncmp(msg[0], "%%[", 3) == 0) {
-		strlcpy(nick, msg[0] + 3, 7);
-		move(4, 0);
-		prints("�즳�ʺ١G%s�p�Ѩ�", nick);
-		msg[0][0] = 0;
-	    } else
-		i = 1;
-	} else
-	    msg[0][0] = 0;
-
-	move(5, 0);
-	outs("�즳�d���G\n");
-	if(msg[0][0])
-	    outs(msg[0]);
-	for (; i < 3; ++i) {
-	    if(fgets(msg[i], sizeof(msg[0]), fp)) {
-		outs(msg[i]);
-		chomp(msg[i]);
-	    } else
-		break;
-	}
-	fclose(fp);
-    }
-
-    getdata_buf(11, 0, "�p�Ѩϼʺ١G", nick, 7, 1);
-    do {
-	move(12, 0);
-	clrtobot();
-	outs("���b���ɭԭn��p�D�H������O�H"
-	     "�̦h�T��A��[Enter]����");
-	for (i = 0; i < 3 &&
-		getdata_buf(14 + i, 0, "�G", msg[i], sizeof(msg[i]), DOECHO);
-		++i);
-	getdata(b_lines - 2, 0, "(S)�x�s (E)���s�ӹL (Q)�����H[S]",
-		buf, 4, LCECHO);
-    } while (buf[0] == 'E' || buf[0] == 'e');
-    if (buf[0] == 'Q' || buf[0] == 'q')
-	return 0;
-    setuserfile(buf, "angelmsg");
-    if (msg[0][0] == 0)
-	unlink(buf);
-    else {
-	FILE* fp = fopen(buf, "w");
-	if(nick[0])
-	    fprintf(fp, "%%%%[%s\n", nick);
-	for (i = 0; i < 3 && msg[i][0]; ++i) {
-	    fputs(msg[i], fp);
-	    fputc('\n', fp);
-	}
-	fclose(fp);
-    }
-    return 0;
-}
-
-static int
-FindAngel(void){
-    int nAngel;
-    int i, j;
-    int choose;
-    int trial = 0;
-    int mask;
-
-    if (cuser.sex < 6) /* ���`�ʧO */
-	mask = 1 | (2 << (cuser.sex & 1));
-    else
-	mask = 7;
-
-    do{
-	nAngel = 0;
-	j = SHM->currsorted;
-	for (i = 0; i < SHM->UTMPnumber; ++i)
-	    if (SHM->uinfo[SHM->sorted[j][0][i]].userlevel & PERM_ANGEL)
-		++nAngel;
-
-	if (nAngel == 0)
-	    return 0;
-
-	choose = random() % nAngel + 1;
-	j = SHM->currsorted;
-	for (i = 0; i < SHM->UTMPnumber && choose; ++i)
-	    if (SHM->uinfo[SHM->sorted[j][0][i]].userlevel & PERM_ANGEL)
-		--choose;
-
-	if (choose == 0 && SHM->uinfo[SHM->sorted[j][0][i - 1]].uid != currutmp->uid
-		&& (SHM->uinfo[SHM->sorted[j][0][i - 1]].userlevel & PERM_ANGEL)
-		&& !he_reject_me(&SHM->uinfo[SHM->sorted[j][0][i - 1]]) ){
-	    strlcpy(cuser.myangel, SHM->uinfo[SHM->sorted[j][0][i - 1]].userid, IDLEN + 1);
-	    passwd_update(usernum, &cuser);
-	    return 1;
-	}
-    }while(++trial < 5);
-    return 0;
-}
-
-static inline void
-GotoNewHand(){
-    char old_board[IDLEN + 1] = "";
-    int canRead = 1;
-
-    if (currutmp && currutmp->mode == EDITING)
-	return;
-
-    // usually crashed as 'assert(currbid == brc_currbid)'
-    if (currboard[0]) {
-	strlcpy(old_board, currboard, IDLEN + 1);
-	currboard = "";// force enter_board
-    }
-
-    if (enter_board(BN_NEWBIE) == 0)
-	canRead = 1;
-
-    if (canRead)
-	Read();
-
-    if (canRead && old_board[0])
-	enter_board(old_board);
-}
-
-
-static inline void
-NoAngelFound(const char* msg){
-    move(b_lines, 0);
-    outs(msg);
-    if (currutmp == NULL || currutmp->mode != EDITING)
-	outs("�A�Х��b�s��O�W�M�䵪�שΫ� Ctrl-P �o��");
-    clrtoeol();
-    refresh();
-    sleep(1);
-    GotoNewHand();
-    return;
-}
-
-static inline void
-AngelNotOnline(){
-    char buf[PATHLEN] = "";
-    const static char* const not_online_message = "�z���p�Ѩϲ{�b���b�u�W";
-
-    // TODO cache angel's nick name!
-
-    if (cuser.myangel[0] != '-')
-	sethomefile(buf, cuser.myangel, "angelmsg");
-    if (cuser.myangel[0] == '-' || !dashf(buf))
-	NoAngelFound(not_online_message);
-    else {
-	time4_t mod = dasht(buf);
-	FILE* fp = fopen(buf, "r");
-	clear();
-	showtitle("�p�Ѩϯd��", BBSNAME);
-	move(4, 0);
-	buf[0] = 0;
-	fgets(buf, sizeof(buf), fp);
-	if (strncmp(buf, "%%[", 3) == 0) {
-	    chomp(buf);
-	    prints("�z��%s�p�Ѩϲ{�b���b�u�W", buf + 3);
-	    fgets(buf, sizeof(buf), fp);
-	} else
-	    outs(not_online_message);
-
-	outs("\n͢�d�����A�G\n");
-	outs(ANSI_COLOR(1;31;44) "��s�w�w�w�w�w�w�w�w�w�w�w�w�w�w�t" ANSI_COLOR(37) ""
-	     "�p�Ѩϯd��" ANSI_COLOR(31) "�u�w�w�w�w�w�w�w�w�w�w�w�w�w�w�s��" ANSI_RESET "\n");
-	outs(ANSI_COLOR(1;31) "�~�t" ANSI_COLOR(32) " �p�Ѩ�                          "
-	     "                                     " ANSI_COLOR(31) "�u��" ANSI_RESET "\n");
-	do {
-	    chomp(buf);
-	    prints(ANSI_COLOR(1;31) "�x" ANSI_RESET "%-74.74s" ANSI_COLOR(1;31) "�x" ANSI_RESET "\n", buf);
-	} while (fgets(buf, sizeof(buf), fp));
-
-	outs(ANSI_COLOR(1;31) "���s�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w"
-		"�w�w�w�w�w�w�w�w�w�w�w�w�w�s��" ANSI_RESET "\n");
-	outs(ANSI_COLOR(1;31;44) "��r�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w�w"
-		"�w�w�w�w�w�w�w�w�w�w�w�w�w�w�r��" ANSI_RESET "\n");
-	prints("%55s%s", "�d�����: ", Cdatelite(&mod));
-
-
-	move(b_lines - 4, 0);
-	outs("�p�D�H�ϥΤW���D�䤣��p�ѨϽШ�s�⪩(" BN_NEWBIE ")\n"
-	     "              �Q�d�����p�ѨϽШ�\\�@��(AngelPray)\n"
-	     "                  �Q��ݪO�b�����ܥi��(AskBoard)\n"
-	     "�Х��b�U�O�W�M�䵪�שΫ� Ctrl-P �o��");
-	pressanykey();
-
-	GotoNewHand();
-    }
-}
-
-static void
-TalkToAngel(){
-    static int AngelPermChecked = 0;
-    userinfo_t* uent;
-    userec_t xuser;
-
-    if (strcmp(cuser.myangel, "-") == 0){
-	AngelNotOnline();
-	return;
-    }
-
-    if (cuser.myangel[0] && !AngelPermChecked) {
-	getuser(cuser.myangel, &xuser); // XXX if user doesn't exist
-	if (!(xuser.userlevel & PERM_ANGEL))
-	    cuser.myangel[0] = 0;
-    }
-    AngelPermChecked = 1;
-
-    if (cuser.myangel[0] == 0 && ! FindAngel()){
-	NoAngelFound("�{�b�S���p�ѨϦb�u�W");
-	return;
-    }
-
-    uent = search_ulist_userid(cuser.myangel);
-    if (uent == 0 || uent->angelpause || he_reject_me(uent)){
-	AngelNotOnline();
-	return;
-    }
-
-    more("etc/angel_usage", NA);
-
-    /* �o�q�ܩγ\�i�H�b�p�ѨϦ^�����D�� show �X��
-    move(b_lines - 1, 0);
-    outs("�{�b�A��id����O�K�A�^���A���D���p�ѨϨä����D�A�O��       \n"
-         "�A�i�H��ܤ��V���z�S�ۤv�����ӫO�@�ۤv                   ");
-	 */
-
-    my_write(uent->pid, "�ݤp�ѨϡG ", "�p�Ѩ�", WATERBALL_ANGEL, uent);
-    return;
-}
-
-void
-CallAngel(){
-    static int      entered = 0;
-    screen_backup_t old_screen;
-
-    if (!HasUserPerm(PERM_LOGINOK) || entered)
-	return;
-    entered = 1;
-
-    scr_dump(&old_screen);
-
-    TalkToAngel();
-
-    scr_restore(&old_screen);
-
-    entered = 0;
-}
-
-#endif
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 29937606..fb158ea0 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -429,10 +429,15 @@ void Customize(void)
 #ifdef PLAY_ANGEL
 	    if (HasUserPerm(PERM_ANGEL))
 	    {
+		static const char *msgs[ANGELPAUSE_MODES] = {
+		    "�}�� (�����Ҧ��p�D�H�o��)",
+		    "���� (�u�����w�^���L���p�D�H�����D)",
+		    "���� (������Ҧ��p�D�H�����D)",
+		};
 		prints("%c. %-40s%s\n", 
 			'1' + iax++, 
-			"�}��p�D�H�߰�", 
-			(currutmp->angelpause ? "�_" : "�O")); 
+			"�p�Ѩϯ��٩I�s��",
+			msgs[currutmp->angelpause % ANGELPAUSE_MODES]);
 	    }
 #endif // PLAY_ANGEL
 	}
@@ -495,9 +500,8 @@ void Customize(void)
 	if( HasUserPerm(PERM_ANGEL) ){ 
 	    if (key == iax-1) 
 	    { 
-		// SwitchBeingAngel(); 
-		currutmp->angelpause = !currutmp->angelpause;
-		// dirty = 1; // pure utmp change can prevent pw dirty
+		angel_toggle_pause();
+		// dirty = 1; // pure utmp change does not need pw dirty
 		continue; 
 	    }
 	}