diff options
| -rw-r--r-- | pttbbs/mbbsd/announce.c | 5 | ||||
| -rw-r--r-- | pttbbs/mbbsd/board.c | 4 | ||||
| -rw-r--r-- | pttbbs/mbbsd/edit.c | 4 | ||||
| -rw-r--r-- | pttbbs/mbbsd/menu.c | 7 | ||||
| -rw-r--r-- | pttbbs/mbbsd/talk.c | 59 |
5 files changed, 2 insertions, 77 deletions
diff --git a/pttbbs/mbbsd/announce.c b/pttbbs/mbbsd/announce.c index 767cd7e1..2a6ccba6 100644 --- a/pttbbs/mbbsd/announce.c +++ b/pttbbs/mbbsd/announce.c @@ -1431,11 +1431,6 @@ a_menu_rec(const char *maintitle, const char *path, me.page = A_INVALID_PAGE; break; - case Ctrl('I'): - t_idle(); - me.page = A_INVALID_PAGE; - break; - case Ctrl('W'): a_where_am_i(root, me.now, me.header[me.now - me.page].title); vmsg(NULL); diff --git a/pttbbs/mbbsd/board.c b/pttbbs/mbbsd/board.c index 158907a6..6141089a 100644 --- a/pttbbs/mbbsd/board.c +++ b/pttbbs/mbbsd/board.c @@ -1564,10 +1564,6 @@ choose_board(int newflag) case 'c': show_brdlist(head, 1, newflag ^= 1); break; - case Ctrl('I'): - t_idle(); - show_brdlist(head, 1, newflag); - break; // ZA case Ctrl('Z'): diff --git a/pttbbs/mbbsd/edit.c b/pttbbs/mbbsd/edit.c index 5b45357a..d9601b4d 100644 --- a/pttbbs/mbbsd/edit.c +++ b/pttbbs/mbbsd/edit.c @@ -3781,10 +3781,6 @@ vedit2(const char *fpath, int saveheader, int *islocal, char title[STRLEN], int t_users(); curr_buf->redraw_everything = YEA; break; - case 'i': - t_idle(); - curr_buf->redraw_everything = YEA; - break; case 'n': search_str(1); break; diff --git a/pttbbs/mbbsd/menu.c b/pttbbs/mbbsd/menu.c index 9b5fbd6e..170db397 100644 --- a/pttbbs/mbbsd/menu.c +++ b/pttbbs/mbbsd/menu.c @@ -457,11 +457,6 @@ domenu(int menu_index, const char *cmdtitle, int cmd, const commands_t cmdtable[ refscreen = YEA; i = lastcmdptr; break; - case Ctrl('I'): - t_idle(); - refscreen = YEA; - i = lastcmdptr; - break; case Ctrl('N'): New(); refscreen = YEA; @@ -695,8 +690,6 @@ static const commands_t talklist[] = { // PERM_CHAT 非 login 也有，會有人用此吵別人。 {t_chat, PERM_LOGINOK, "CChat 【" BBSMNAME2 "多人聊天室】"}, {t_pager, PERM_BASIC, "PPager 切換呼叫器"}, - // XXX 發呆有太多其它方法可以進去了... drop? - {t_idle, 0, "IIdle 發呆"}, {t_qchicken, 0, "WWatch Pet 查詢寵物"}, #ifdef PLAY_ANGEL {a_changeangel, diff --git a/pttbbs/mbbsd/talk.c b/pttbbs/mbbsd/talk.c index 9736571a..01c4c683 100644 --- a/pttbbs/mbbsd/talk.c +++ b/pttbbs/mbbsd/talk.c @@ -4,9 +4,6 @@ #define QCAST int (*)(const void *, const void *) -static char * const IdleTypeTable[] = { - "偶在花呆啦", "情人來電", "覓食中", "拜見周公", "假死狀態", "我在思考" -}; static char * const sig_des[] = { "鬥雞", "交談", "", "下棋", "象棋", "暗棋", "下圍棋", "下黑白棋", }; @@ -150,9 +147,8 @@ modestring(const userinfo_t * uentp, int simple) } else snprintf(modestr, sizeof(modestr), "不行了 @_@"); else if (!mode) - return (uentp->destuid == 6) ? uentp->chatid : - IdleTypeTable[(0 <= uentp->destuid && uentp->destuid < 6) ? - uentp->destuid : 0]; + return (uentp->destuid == 6) ? uentp->chatid : "發呆中"; + else if (simple) return word; else if (uentp->in_chat && mode == CHATING) @@ -2726,57 +2722,6 @@ t_pager(void) } int -t_idle(void) -{ - int destuid0 = currutmp->destuid; - int mode0 = currutmp->mode; - int stat0 = currstat; - char genbuf[20]; - char passbuf[PASSLEN]; - int idle_type; - char idle_reason[sizeof(currutmp->chatid)]; - - - setutmpmode(IDLE); - getdata(b_lines - 1, 0, "理由：[0]發呆 (1)接電話 (2)覓食 (3)打瞌睡 " - "(4)裝死 (5)羅丹 (6)其他 (Q)沒事？", genbuf, 3, DOECHO); - if (genbuf[0] == 'q' || genbuf[0] == 'Q') { - currutmp->mode = mode0; - currstat = stat0; - return 0; - } else if (genbuf[0] >= '1' && genbuf[0] <= '6') - idle_type = genbuf[0] - '0'; - else - idle_type = 0; - - if (idle_type == 6) { - if (cuser.userlevel && getdata(b_lines - 1, 0, "發呆的理由：", idle_reason, sizeof(idle_reason), DOECHO)) { - strlcpy(currutmp->chatid, idle_reason, sizeof(currutmp->chatid)); - } else { - idle_type = 0; - } - } - currutmp->destuid = idle_type; - do { - move(b_lines - 2, 0); - clrtobot(); - prints("(鎖定螢幕)發呆原因: %s", (idle_type != 6) ? - IdleTypeTable[idle_type] : idle_reason); - refresh(); - getdata(b_lines - 1, 0, MSG_PASSWD, passbuf, sizeof(passbuf), NOECHO); - passbuf[8] = '\0'; - } - while (!checkpasswd(cuser.passwd, passbuf) && - strcmp(STR_GUEST, cuser.userid)); - - currutmp->mode = mode0; - currutmp->destuid = destuid0; - currstat = stat0; - - return 0; -} - -int t_qchicken(void) { char uident[STRLEN]; |