Changing angel, alarm of directly throwing waterball.

Comment of my_write(). Short cut key for CCloak to KCloak.


git-svn-id: http://opensvn.csie.org/pttbbs/branches/scw.angel@1935 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

3 files changed, 34 insertions, 7 deletions

diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 9e39ae1d..4a4fcb8a 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -364,7 +364,7 @@ static commands_t talklist[] = {
     {t_chat, PERM_CHAT,     "CChat          找家茶坊喫茶去"},
     {t_display, 0,          "DDisplay       顯示上幾次熱訊"},
 #ifdef PLAY_ANGEL
-    {t_changeangel, PERM_BASIC, "CChange Angel  更換小天使"},
+    {t_changeangel, PERM_BASIC, "AChange Angel  更換小天使"},
 #endif
     {NULL, 0, NULL}
 };
@@ -406,9 +406,9 @@ static commands_t userlist[] = {
     {u_editplan, PERM_LOGINOK,      "QQueryEdit     編輯名片檔"},
     {u_editsig, PERM_LOGINOK,       "SSignature     編輯簽名檔"},
 #if HAVE_FREECLOAK
-    {u_cloak, PERM_LOGINOK,           "CCloak         隱身術"},
+    {u_cloak, PERM_LOGINOK,           "KCloak         隱身術"},
 #else
-    {u_cloak, PERM_CLOAK,           "CCloak         隱身術"},
+    {u_cloak, PERM_CLOAK,           "KCloak         隱身術"},
 #endif
     {u_register, PERM_BASIC,        "RRegister      填寫《註冊申請單》"},
     {u_list, PERM_SYSOP,            "UUsers         列出註冊名單"},
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index ca337041..a8238da4 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -574,10 +574,13 @@ my_write2(void)
 }
 
 /*
- * 被呼叫的時機: 1. 丟群組水球 flag = 1 (pre-edit) 2. 回水球     flag = 0 3.
- * 上站aloha  flag = 2 (pre-edit) 4. 廣播       flag = 3 if SYSOP, otherwise
- * flag = 1 (pre-edit) 5. 丟水球     flag = 0 6. my_write2  flag = 4
- * (pre-edit) but confirm
+ * 被呼叫的時機:
+ * 1. 丟群組水球 flag = 1 (pre-edit)
+ * 2. 回水球     flag = 0
+ * 3. 上站aloha  flag = 2 (pre-edit)
+ * 4. 廣播       flag = 3 if SYSOP, otherwise flag = 1 (pre-edit)
+ * 5. 丟水球     flag = 0
+ * 6. my_write2  flag = 4 (pre-edit) but confirm
  */
 int
 my_write(pid_t pid, char *prompt, char *id, int flag, userinfo_t * puin)
@@ -1860,6 +1863,9 @@ draw_pickup(int drawall, pickup_t * pickup, int pickup_way,
 int
 call_in(userinfo_t * uentp, int fri_stat)
 {
+    if( ! strcasecmp(uentp->userid, cuser.myangel) )
+	outmsg("直接丟水球給小天使是會被知道 ID 的喔！");
+ 
     if (iswritable_stat(uentp, fri_stat)) {
 	char            genbuf[60];
 	snprintf(genbuf, sizeof(genbuf), "Call-In %s ：", uentp->userid);
@@ -2718,3 +2724,22 @@ talkreply(void)
  * ""); } if (++linecnt < 3){ strcat(uentry, "│"); outs(uentry); } else{
  * outs(uentry); linecnt = 0; clrtoeol(); move(++lineno, 0); } return 0; }
  */
+
+/* 小天使小主人處理函式 */
+int
+t_changeangel(){
+    char buf[4];
+    if( cuser.myangel[0] == 0 ) return 0;
+    getdata(b_lines - 1, 0,
+	    "更換小天使後就無法換回了喔！ 是否要更換小天使？ [y/N]",
+	    buf, 3, LCECHO);
+    if( buf[0] == 'y' || buf[0] == 'Y' ){
+	cuser.myangel[0] = 0;
+	vmsg("小天使更新完成，下次呼叫時會選出新的小天使");
+    }
+    return 0;
+}
+
+void
+CallAngel(){
+}
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 8ca757f7..a4ca8e02 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -90,6 +90,8 @@ user_display(userec_t * u, int real)
 	   get_num_records(genbuf, sizeof(fileheader_t)),
 	   u->exmailbox, u->mobile,
 	   u->month, u->day, u->year % 100, u->mychicken.name);
+    prints("                小 天 使: %s\n",
+	    u->myangel[0] ? u->myangel : "無");
     prints("                註冊日期: %s", ctime(&u->firstlogin));
     prints("                前次光臨: %s", ctime(&u->lastlogin));
     prints("                前次點歌: %s", ctime(&u->lastsong));