summaryrefslogtreecommitdiffstats
path: root/mbbsd
diff options
context:
space:
mode:
authorscw <scw@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2006-07-30 21:02:46 +0800
committerscw <scw@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2006-07-30 21:02:46 +0800
commitc3dc862ba619c444001f3d85369300b8a39007b2 (patch)
treea87dcd8995af0ce1a6d5bd84b40a53fb6c4d19db /mbbsd
parent438e007143ef2d494912613d09998aaa0b28fdc5 (diff)
downloadpttbbs-c3dc862ba619c444001f3d85369300b8a39007b2.tar
pttbbs-c3dc862ba619c444001f3d85369300b8a39007b2.tar.gz
pttbbs-c3dc862ba619c444001f3d85369300b8a39007b2.tar.bz2
pttbbs-c3dc862ba619c444001f3d85369300b8a39007b2.tar.lz
pttbbs-c3dc862ba619c444001f3d85369300b8a39007b2.tar.xz
pttbbs-c3dc862ba619c444001f3d85369300b8a39007b2.tar.zst
pttbbs-c3dc862ba619c444001f3d85369300b8a39007b2.zip
Display angel usage when calling angel
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3395 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd')
-rw-r--r--mbbsd/admin.c10
-rw-r--r--mbbsd/talk.c4
2 files changed, 10 insertions, 4 deletions
diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index c75c8ef0..5b094b59 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -684,7 +684,7 @@ x_file(void)
/* Ptt */
outs("設定 (1)身份確認信 (4)post注意事項 (5)錯誤登入訊息 (6)註冊範例 (7)通過確認通知\n");
outs(" (8)email post通知 (9)系統功\能精靈 (A)茶樓 (B)站長名單 (C)email通過確認\n");
- outs(" (D)新使用者需知 (E)身份確認方法 (F)歡迎畫面 (G)進站畫面"
+ outs(" (D)新使用者需知 (E)身份確認方法 (F)歡迎畫面 (G)進站畫面 "
#ifdef MULTI_WELCOME_LOGIN
"(X)刪除進站畫面"
#endif
@@ -692,7 +692,7 @@ x_file(void)
outs(" (H)看板期限 (I)故鄉 (J)出站畫面 (K)生日卡 (L)節日 (M)外籍使用者認證通知\n");
outs(" (N)外籍使用者過期警告通知 (O)看板列表 help (P)文章列表 help\n");
#ifdef PLAY_ANGEL
- outs(" (Y)小天使認證通知\n");
+ outs(" (R)小天使認證通知 (S)小天使功\能說明\n");
#endif
getdata(b_lines - 1, 0, "[Q]取消[1-9 A-P]?", ans, sizeof(ans), LCECHO);
@@ -803,9 +803,13 @@ x_file(void)
break;
#ifdef PLAY_ANGEL
- case 'y':
+ case 'r':
fpath = "etc/angel_notify";
break;
+
+ case 's':
+ fpath = "etc/angel_usage";
+ break;
#endif
default:
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 43feb4b2..11b1abfb 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -3426,8 +3426,8 @@ AngelNotOnline(){
static void
TalkToAngel(){
- userinfo_t* uent;
static int AngelPermChecked = 0;
+ userinfo_t* uent;
userec_t xuser;
if (strcmp(cuser.myangel, "-") == 0){
@@ -3453,6 +3453,8 @@ TalkToAngel(){
return;
}
+ more("etc/angel_usage", NA);
+
/* 這段話或許可以在小天使回答問題時 show 出來
move(b_lines - 1, 0);
outs("現在你的id受到保密,回答你問題的小天使並不知道你是誰 \n"